diff --git a/Gemfile.lock b/Gemfile.lock
index 279537629..bc45a0f23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -179,7 +179,7 @@ GEM
     google-protobuf (4.35.1-x86_64-linux-musl)
       bigdecimal
       rake (~> 13.3)
-    graphql (2.6.5)
+    graphql (2.6.6)
       base64
       fiber-storage
       logger
@@ -254,8 +254,8 @@ GEM
     nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
     ostruct (0.6.2)
-    parallel (1.28.0)
-    parser (3.3.11.1)
+    parallel (2.1.0)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.3)
@@ -310,7 +310,7 @@ GEM
     rbi (0.4.0)
       prism (~> 1.0)
       rbs (>= 4.0.1)
-    rbs (4.0.3)
+    rbs (4.1.0)
       logger
       prism (>= 1.6.0)
       tsort
@@ -325,7 +325,7 @@ GEM
     regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
-    require-hooks (0.4.0)
+    require-hooks (0.4.1)
     rexml (3.4.4)
     rubocop (1.88.2)
       json (~> 2.3)
@@ -347,7 +347,7 @@ GEM
       rubocop (~> 1.86, >= 1.86.2)
     rubocop-shopify (2.18.0)
       rubocop (~> 1.62)
-    rubocop-sorbet (0.13.1)
+    rubocop-sorbet (0.13.2)
       lint_roller
       rubocop (>= 1.75.2)
     ruby-lsp (0.26.10)
@@ -357,10 +357,10 @@ GEM
     ruby-lsp-rails (0.4.8)
       ruby-lsp (>= 0.26.0, < 0.27.0)
     ruby-progressbar (1.13.0)
-    rubydex (0.2.9-aarch64-linux)
-    rubydex (0.2.9-arm64-darwin)
-    rubydex (0.2.9-x86_64-darwin)
-    rubydex (0.2.9-x86_64-linux)
+    rubydex (0.3.0-aarch64-linux)
+    rubydex (0.3.0-arm64-darwin)
+    rubydex (0.3.0-x86_64-darwin)
+    rubydex (0.3.0-x86_64-linux)
     securerandom (0.4.1)
     shopify-money (4.1.1)
       bigdecimal (>= 3.0)
@@ -371,19 +371,19 @@ GEM
       rack (>= 3.2.0)
       redis-client (>= 0.29.0)
     smart_properties (1.17.0)
-    sorbet (0.6.13341)
-      sorbet-static (= 0.6.13341)
-    sorbet-runtime (0.6.13341)
-    sorbet-static (0.6.13341-aarch64-linux)
-    sorbet-static (0.6.13341-universal-darwin)
-    sorbet-static (0.6.13341-x86_64-linux)
-    sorbet-static-and-runtime (0.6.13341)
-      sorbet (= 0.6.13341)
-      sorbet-runtime (= 0.6.13341)
-    spoom (1.7.16)
+    sorbet (0.6.13363)
+      sorbet-static (= 0.6.13363)
+    sorbet-runtime (0.6.13363)
+    sorbet-static (0.6.13363-aarch64-linux)
+    sorbet-static (0.6.13363-universal-darwin)
+    sorbet-static (0.6.13363-x86_64-linux)
+    sorbet-static-and-runtime (0.6.13363)
+      sorbet (= 0.6.13363)
+      sorbet-runtime (= 0.6.13363)
+    spoom (1.8.4)
       erubi (>= 1.10.0)
       prism (>= 0.28.0)
-      rbi (>= 0.3.3)
+      rbi (>= 0.3.15)
       rbs (>= 4.0.0.dev.5)
       rexml (>= 3.2.6)
       sorbet-static-and-runtime (>= 0.5.10187)
@@ -398,7 +398,7 @@ GEM
     sqlite3 (2.9.0-x86_64-darwin)
     sqlite3 (2.9.0-x86_64-linux-gnu)
     sqlite3 (2.9.0-x86_64-linux-musl)
-    state_machines (0.201.0)
+    state_machines (0.202.0)
     stringio (3.2.0)
     thor (1.5.0)
     timeout (0.6.1)
@@ -420,7 +420,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.44)
+    yard (0.9.45)
     zeitwerk (2.7.5)
     zlib (3.2.3)
 
@@ -528,7 +528,7 @@ CHECKSUMS
   google-protobuf (4.35.1-x86_64-darwin) sha256=66b62b4df00931018a692806df66393efa960d6d2b7da69735187249f950d3ee
   google-protobuf (4.35.1-x86_64-linux-gnu) sha256=c786439087512a3fbd199e9897d265b855f951d4027e218ea55e858d45969edd
   google-protobuf (4.35.1-x86_64-linux-musl) sha256=91890eb0002934a339fdb7d77a147c46b7474b6799db27872b747b905837f744
-  graphql (2.6.5) sha256=1051825bfb4aedb4293cdbcd9726c3150e69e3512556609a32c2ca19d4be3d00
+  graphql (2.6.6) sha256=7438e2036b571c884377eb1529225470ba959365f26dc47152953c213bc38c31
   hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
   i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
   identity_cache (1.6.4) sha256=3f043ff06577765ef532656b1af1058f9a983edcf525ba4f5fa79f0bd6324f26
@@ -564,8 +564,8 @@ CHECKSUMS
   nokogiri (1.19.4-x86_64-linux-gnu) sha256=379fae440b28915e3f19d752ce2dcf8465ed2b2fbefd2a7ca0dd497bc981a06a
   nokogiri (1.19.4-x86_64-linux-musl) sha256=17dfb7c1fa194ae02fbf7c51a7afc8d278045ab3fdacfd86f91d02d7b274470b
   ostruct (0.6.2) sha256=6d7302a299e400a2c248d6ce0dad18fc3a5714e8096facc25ffd0c54ee57cfc0
-  parallel (1.28.0) sha256=33e6de1484baf2524792d178b0913fc8eb94c628d6cfe45599ad4458c638c970
-  parser (3.3.11.1) sha256=d17ace7aabe3e72c3cc94043714be27cc6f852f104d81aa284c2281aecc65d54
+  parallel (2.1.0) sha256=b35258865c2e31134c5ecb708beaaf6772adf9d5efae28e93e99260877b09356
+  parser (3.3.12.0) sha256=21a6d7f755d5a24dfbdc6e6b772e4e879a52e7631a88bc5a3a134606052c9828
   pp (0.6.3) sha256=2951d514450b93ccfeb1df7d021cae0da16e0a7f95ee1e2273719669d0ab9df6
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
@@ -583,37 +583,37 @@ CHECKSUMS
   rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
   rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
   rbi (0.4.0) sha256=cb54fe8ba39c113e7c8ce93b411d2681cf9c67d95c2da779906d61d6ecb902d3
-  rbs (4.0.3) sha256=5a7bf70e2628549d9a1f44eae447b2cfe55968a9c60cfff52693a4bdcc020e14
+  rbs (4.1.0) sha256=8baba59008b0643b4ba2090e9b1d0149655b0bbd42eb2ffe42b1d0eb6923fd72
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
   redis (5.4.0) sha256=798900d869418a9fc3977f916578375b45c38247a556b61d58cba6bb02f7d06b
   redis-client (0.29.0) sha256=0c65bf1f8f6dca22063ddb085c0bb2054feef6f03a84869f4161b18a9a15bea3
   regexp_parser (2.12.0) sha256=35a916a1d63190ab5c9009457136ae5f3c0c7512d60291d0d1378ba18ce08ebb
   reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
-  require-hooks (0.4.0) sha256=005f4c6435b4edae73e358cdbaba48370a4121f9ce893d5d2a3c66fce855677d
+  require-hooks (0.4.1) sha256=3a4cd3ed0131b9ec5c2e68f64cb0c5ba56daec6fc363d56e8eef74816c374d7d
   rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
   rubocop (1.88.2) sha256=8def251c90cd955feb4daa3edc0ab56893250c4ce90ef81e6c80c03f9a939bbf
   rubocop-ast (1.50.0) sha256=b9ca88300da0803ee222ad20cdb30494c0a784eed06fdc35d254b06d662788db
   rubocop-rspec (3.10.2) sha256=0b3e2ecc592cd10ecbf0095bb58d1e357905276e069643523cc19eb7495f65e2
   rubocop-shopify (2.18.0) sha256=dafa25e5617ce4600ff86b1de3d5b78e43ab3d58cc5729df38e492b8e10294eb
-  rubocop-sorbet (0.13.1) sha256=f81a4c8dce8ebec861af785f5e48ed936913eb7835086aef17423d289d51dd2c
+  rubocop-sorbet (0.13.2) sha256=7901e57b6b8e9e9b970d941dbdbb89f2c9de0183bfd2551460468f8aa9548655
   ruby-lsp (0.26.10) sha256=e67284af94423531f6b9a583350596421b5a6a4dd93083f1c2ba03da7c23bbed
   ruby-lsp-rails (0.4.8) sha256=f09d1f926d4063deeb2f3049311925c20dfe6c912371e3bcd04a265a865c44ae
   ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
-  rubydex (0.2.9-aarch64-linux) sha256=74391fd22c4b4ccca1b695d634daad13326e7cc81567e96549da17c5031265bb
-  rubydex (0.2.9-arm64-darwin) sha256=1c014e3c244102739914d528202b1d0f54bdc3d1f85667b81b65ea22aabfa560
-  rubydex (0.2.9-x86_64-darwin) sha256=000df1723b090d9176dbceb8e291b72f93931cc3c7782f32287e0db6c20c1dd7
-  rubydex (0.2.9-x86_64-linux) sha256=f500e843d285def8fc799e0f9a989b9ba2b01b9372bde6ab0a6831738b3f6956
+  rubydex (0.3.0-aarch64-linux) sha256=a7221b71b21c5a1cdda1fbac0946ee0411a2efd94c8115cf37e4e69461d88e73
+  rubydex (0.3.0-arm64-darwin) sha256=19f685610216e4e7f488722ac90dfbc33113a384dd16db309cf939606f4c32dd
+  rubydex (0.3.0-x86_64-darwin) sha256=59d20c98b0bf2226f5db5bee14cf57075aa93aa0c3fa0176f496a217691ff7b6
+  rubydex (0.3.0-x86_64-linux) sha256=dfe4026591f226b4a1b53f82f86dc14fad2e7c221ee8a5be99a0a46bf2d58b04
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
   shopify-money (4.1.1) sha256=523078e44bfde1920f8b3487ddf9144e0fb6af8cdf67e212bed02025c5c5f423
   sidekiq (8.1.6) sha256=be20cd051124b1a16cf97ea9157137abbd30a515c16a5ae9312d2eadd045e40f
   smart_properties (1.17.0) sha256=f9323f8122e932341756ddec8e0ac9ec6e238408a7661508be99439ca6d6384b
-  sorbet (0.6.13341) sha256=c84abd590e5ca591205a986e776480ff39238af56b7bd422508b9f44921befdc
-  sorbet-runtime (0.6.13341) sha256=b1dfbf0e08ba4a684b5e5e8468c486aa1fea20dfd862502f3b7f80f5da2b4c90
-  sorbet-static (0.6.13341-aarch64-linux) sha256=42a53bf5f22adfbe46acf816c93a621a75a4e30cd81d04e80a9d53c7d4ac2342
-  sorbet-static (0.6.13341-universal-darwin) sha256=762c0c03f63d91eb4301efdd3c013b8b0fffac8b8a3af0efe26164e0dd11bd1f
-  sorbet-static (0.6.13341-x86_64-linux) sha256=3d8d8872a8524fb4bfdcb1eeacbf1ab957a7d7905757ad52afa0af745a061011
-  sorbet-static-and-runtime (0.6.13341) sha256=1edd6923e5baa128ec05d1dcd6457109d15189a144d722066bb607658b77df03
-  spoom (1.7.16) sha256=b6033d1aaede800ef37505474d260d57a02fa63364b4725ea40b6f606e932d59
+  sorbet (0.6.13363) sha256=e9fb44bd815617f698ec69547b3901c35fcee5e0f197900f2d64857e2c5ad01e
+  sorbet-runtime (0.6.13363) sha256=f1f0b2e946fb3cd76b9d8e3d85459cdaf7f5466331a400cafcf008e508b6d2c3
+  sorbet-static (0.6.13363-aarch64-linux) sha256=e8177fceb59678b9449ed94ce8c115783a73b14f5d7597e2a51029f3230fc21e
+  sorbet-static (0.6.13363-universal-darwin) sha256=b2e4863b325d0d3d3764ebbaca4fa08ef08f8c1d1b891e10ec6391bf624413b9
+  sorbet-static (0.6.13363-x86_64-linux) sha256=c5252f9e05d4f8b14686ffef928d5bb56a8e441d18f4d256b42c93471d1e1e54
+  sorbet-static-and-runtime (0.6.13363) sha256=12d8b45cb1c51911398737a3e40fd50c990a130302469b0710f60d14e75dacff
+  spoom (1.8.4) sha256=7283c94a7bbfdfe8764af9027cee2929ef6e1a14271f285e6924e896ca52e880
   sprockets (4.2.2) sha256=761e5a49f1c288704763f73139763564c845a8f856d52fba013458f8af1b59b1
   sqlite3 (2.9.0-aarch64-linux-gnu) sha256=cfe1e0216f46d7483839719bf827129151e6c680317b99d7b8fc1597a3e13473
   sqlite3 (2.9.0-aarch64-linux-musl) sha256=56a35cb2d70779afc2ac191baf2c2148242285ecfed72f9b021218c5c4917913
@@ -621,7 +621,7 @@ CHECKSUMS
   sqlite3 (2.9.0-x86_64-darwin) sha256=59fe51baa3cb33c36d27ce78b4ed9360cd33ccca09498c2ae63850c97c0a6026
   sqlite3 (2.9.0-x86_64-linux-gnu) sha256=72fff9bd750070ba3af695511ba5f0e0a2d8a9206f84869640b3e99dfaf3d5a5
   sqlite3 (2.9.0-x86_64-linux-musl) sha256=ef716ba7a66d7deb1ccc402ac3a6d7343da17fac862793b7f0be3d2917253c90
-  state_machines (0.201.0) sha256=807bafdd5d7dbfb3e23d77897edfe38e505b6e0738a2b7259dab566f46b9d319
+  state_machines (0.202.0) sha256=20db5367b4541155fc6d764f8ba54182ba6d49ceac7d917598709a61143a16e1
   stringio (3.2.0) sha256=c37cb2e58b4ffbd33fe5cd948c05934af997b36e0b6ca6fdf43afa234cf222e1
   tapioca (0.19.2)
   thor (1.5.0) sha256=e3a9e55fe857e44859ce104a84675ab6e8cd59c650a49106a05f55f136425e73
@@ -636,7 +636,7 @@ CHECKSUMS
   websocket-driver (0.8.1) sha256=5ab238238ce230e5d4b262d2be39624c867914eab99171dc4952b58b577c2d96
   websocket-extensions (0.1.5) sha256=1c6ba63092cda343eb53fc657110c71c754c56484aad42578495227d717a8241
   xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e
-  yard (0.9.44) sha256=eb087e9b631ccd887b049f303d489963945452d5e2a7eb49a5a74a7cf6887f28
+  yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51
   zeitwerk (2.7.5) sha256=d8da92128c09ea6ec62c949011b00ed4a20242b255293dd66bf41545398f73dd
   zlib (3.2.3) sha256=5bd316698b32f31a64ab910a8b6c282442ca1626a81bbd6a1674e8522e319c20
 
diff --git a/sorbet/rbi/gems/graphql@2.6.5.rbi b/sorbet/rbi/gems/graphql@2.6.6.rbi
similarity index 99%
rename from sorbet/rbi/gems/graphql@2.6.5.rbi
rename to sorbet/rbi/gems/graphql@2.6.6.rbi
index b4c43c207..47f3e2d99 100644
--- a/sorbet/rbi/gems/graphql@2.6.5.rbi
+++ b/sorbet/rbi/gems/graphql@2.6.6.rbi
@@ -663,10 +663,10 @@ class GraphQL::Backtrace
   def initialize(context, value: T.unsafe(nil)); end
 
   # pkg:gem/graphql#lib/graphql/backtrace.rb:21
-  def [](*_arg0, **_arg1, &_arg2); end
+  def [](*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/backtrace.rb:21
-  def each(*_arg0, **_arg1, &_arg2); end
+  def each(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/backtrace.rb:31
   def inspect; end
@@ -834,24 +834,24 @@ class GraphQL::Dataloader
 
   # @api private Nothing to see here
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:144
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:146
   def append_job(callable = T.unsafe(nil), &job); end
 
   # This method is called when Dataloader is finished using a fiber.
   # Use it to perform any cleanup, such as releasing database connections (if required manually)
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:102
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:104
   def cleanup_fiber; end
 
   # Clear any already-loaded objects from {Source} caches
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:153
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:163
   def clear_cache; end
 
   # @return [Integer, nil]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:71
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:73
   def fiber_limit; end
 
   # This is called before the fiber is spawned, from the parent context (i.e. from
@@ -859,12 +859,12 @@ class GraphQL::Dataloader
   #
   # @return [Hash<Symbol, Object>] Current fiber-local variables
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:81
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:83
   def get_fiber_variables; end
 
   # @api private
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:246
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:259
   def lazy_at_depth(depth, lazy); end
 
   # Pre-warm the Dataloader cache with ActiveRecord objects which were loaded elsewhere.
@@ -874,23 +874,28 @@ class GraphQL::Dataloader
   # @param index_by [Symbol] The attribute to use as the cache key. (Should match `find_by:` when using {ActiveRecordSource})
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:265
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:278
   def merge_records(records, index_by: T.unsafe(nil)); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:73
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:75
   def nonblocking?; end
 
+  # @api private
+  #
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:154
+  def queue_pending_source(source); end
+
   # @param trace_query_lazy [nil, Execution::Multiplex]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:198
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:209
   def run(trace_query_lazy: T.unsafe(nil)); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:241
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:254
   def run_fiber(f); end
 
   # Use a self-contained queue for the work in the block.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:161
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:171
   def run_isolated; end
 
   # Set up the fiber variables in a new fiber.
@@ -900,15 +905,15 @@ class GraphQL::Dataloader
   # @param vars [Hash<Symbol, Object>] Fiber-local variables from {get_fiber_variables}
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:95
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:97
   def set_fiber_variables(vars); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:250
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:263
   def spawn_fiber; end
 
   # truffle-ruby wasn't doing well with the implementation below
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:121
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:123
   def with(source_class, *batch_args, **batch_kwargs); end
 
   # Tell the dataloader that this fiber is waiting for data.
@@ -917,30 +922,38 @@ class GraphQL::Dataloader
   #
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:135
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:137
   def yield(source = T.unsafe(nil)); end
 
   private
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:330
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:338
   def calculate_fiber_limit; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:341
-  def join_queues(prev_queue, new_queue); end
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:376
+  def dequeue_pending_source; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:277
-  def run_next_pending_lazies(job_fibers, trace); end
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:367
+  def drain_pending_sources; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:297
+  # Returns true if anything was actually enqueued
+  #
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:291
+  def enqueue_next_pending_lazies(lazies_at_depth); end
+
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:349
+  def join_queues(prev_queue, new_queue); end
+
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:305
   def run_pending_steps(trace, job_fibers, next_job_fibers, jobs_fiber_limit, source_fibers, next_source_fibers, total_fiber_limit); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:347
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:355
   def spawn_job_fiber(trace); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:359
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:383
   def spawn_source_fiber(trace); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader.rb:321
+  # pkg:gem/graphql#lib/graphql/dataloader.rb:329
   def with_trace_query_lazy(multiplex_or_nil, &block); end
 
   class << self
@@ -1007,45 +1020,42 @@ class GraphQL::Dataloader::AsyncDataloader < ::GraphQL::Dataloader
   # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:17
   def initialize(*_arg0, **_arg1, &_arg2); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:149
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:154
   def active_run; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:140
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:145
   def append_job(callable = T.unsafe(nil), &block); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:22
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:25
   def create_pending_run; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:145
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:150
   def lazy_at_depth(depth, lazy); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:187
+  # @api private
+  #
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:23
+  def pending_sources; end
+
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:193
   def run(trace_query_lazy: T.unsafe(nil)); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:153
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:158
   def run_isolated; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:27
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:30
   def yield(source = T.unsafe(nil)); end
 
   private
 
-  # TODO DRY  Had to duplicate to remove spawn_job_fiber
-  #
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:295
-  def run_next_pending_lazies(run); end
-
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:235
-  def run_pending_steps(run); end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:242
+  def run_queue(run, condition, mode); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:275
-  def run_sources(run); end
-
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:253
-  def spawn_job_task(run); end
-
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:321
-  def spawn_source_task(run, num_tasks); end
+  # Use a separate method for this so that the outer loop's reassignment of `pending_work`
+  # doesn't affect already-running tasks which (would) close over that variable
+  #
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:279
+  def spawn_tasks(run, mode, condition, pending_work, num_tasks); end
 
   class << self
     # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:6
@@ -1053,67 +1063,69 @@ class GraphQL::Dataloader::AsyncDataloader < ::GraphQL::Dataloader
   end
 end
 
-# pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:40
+# pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:43
 class GraphQL::Dataloader::AsyncDataloader::Run
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:41
-  def initialize(total_fiber_limit, jobs_fiber_limit); end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:44
+  def initialize(dataloader, total_fiber_limit, jobs_fiber_limit); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:69
-  def allowed_sources_tasks; end
-
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:78
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:75
   def close_queues; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
-  def finished_tasks; end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:127
+  def current_sources_fiber_limit; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
   def jobs; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:67
   def jobs_bandwidth?; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
   def jobs_fiber_limit; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
   def lazies_at_depth; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:103
-  def new_queues; end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:90
+  def new_queues(mode); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:61
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
   def root_task; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:61
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
   def root_task=(_arg0); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:135
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:123
   def running?; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:86
-  def running_count; end
-
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
   def snoozed_jobs_condition; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
   def snoozed_sources_condition; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
-  def started_tasks; end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:71
+  def sources_bandwidth?; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
-  def total_fiber_limit; end
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:65
+  def tasks_channel; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:61
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
   def trace; end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:61
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:63
   def trace=(_arg0); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:94
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:85
+  def wait_for_no_running_tasks; end
+
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:80
   def wait_for_queues; end
+
+  private
+
+  # pkg:gem/graphql#lib/graphql/dataloader/async_dataloader.rb:138
+  def running_count; end
 end
 
 # GraphQL-Ruby uses this when Dataloader isn't enabled.
@@ -1186,7 +1198,7 @@ class GraphQL::Dataloader::Source
   # Clear any already-loaded objects for this source
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:187
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:183
   def clear_cache; end
 
   # pkg:gem/graphql#lib/graphql/dataloader/source.rb:18
@@ -1196,19 +1208,19 @@ class GraphQL::Dataloader::Source
   # @param keys [Array<Object>] keys passed to {#load}, {#load_all}, {#request}, or {#request_all}
   # @return [Array<Object>] A loaded value for each of `keys`. The array must match one-for-one to the list of `keys`.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:99
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:94
   def fetch(keys); end
 
   # @param value [Object] A loading value which will be passed to {#fetch} if it isn't already in the internal cache.
   # @return [Object] The result from {#fetch} for `key`. If `key` hasn't been loaded yet, the Fiber will yield until it's loaded.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:63
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:59
   def load(value); end
 
   # @param values [Array<Object>] Loading keys which will be passed to `#fetch` (or read from the internal cache).
   # @return [Object] The result from {#fetch} for `keys`. If `keys` haven't been loaded yet, the Fiber will yield until they're loaded.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:76
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:72
   def load_all(values); end
 
   # Add these key-value pairs to this source's cache
@@ -1216,7 +1228,7 @@ class GraphQL::Dataloader::Source
   # @param new_results [Hash<Object => Object>] key-value pairs to cache in this source
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:130
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:126
   def merge(new_results); end
 
   # Implement this method if varying values given to {load} (etc) should be consolidated
@@ -1228,15 +1240,15 @@ class GraphQL::Dataloader::Source
   # @param value [Object] The value passed to {load}, {load_all}, {request}, or {request_all}
   # @return [Object] The value given to {fetch}
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:46
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:44
   def normalize_fetch_key(value); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:192
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:188
   def pending; end
 
   # @return [Boolean] True if this source has any pending requests for data.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:122
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:118
   def pending?; end
 
   # @return [Dataloader::Request] a pending request for a value from `key`. Call `.load` on that object to wait for the result.
@@ -1246,7 +1258,7 @@ class GraphQL::Dataloader::Source
 
   # @return [Dataloader::Request] a pending request for a values from `keys`. Call `.load` on that object to wait for the results.
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:51
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:49
   def request_all(values); end
 
   # Implement this method to return a stable identifier if different
@@ -1255,17 +1267,17 @@ class GraphQL::Dataloader::Source
   # @param value [Object] A value passed to `.request` or `.load`, for which a value will be loaded
   # @return [Object] The key for tracking this pending data
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:34
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:32
   def result_key_for(value); end
 
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:192
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:188
   def results; end
 
   # Called by {GraphQL::Dataloader} to resolve and pending requests to this source.
   # @api private
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:141
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:137
   def run_pending_keys; end
 
   # Called by {Dataloader} to prepare the {Source}'s internal state
@@ -1278,17 +1290,20 @@ class GraphQL::Dataloader::Source
   # Then run the batch and update the cache.
   # @return [void]
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:108
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:103
   def sync(pending_result_keys); end
 
   private
 
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:192
+  def add_pending_key(result_key, value); end
+
   # Reads and returns the result for the key from the internal cache, or raises an error if the result was an error
   # @param key [Object] key passed to {#load} or {#load_all}
   # @return [Object] The result from {#fetch} for `key`.
   # @api private
   #
-  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:200
+  # pkg:gem/graphql#lib/graphql/dataloader/source.rb:205
   def result_for(key); end
 
   class << self
@@ -1307,12 +1322,12 @@ class GraphQL::Dataloader::Source
     # @param batch_kwargs [Hash]
     # @return [Object]
     #
-    # pkg:gem/graphql#lib/graphql/dataloader/source.rb:177
+    # pkg:gem/graphql#lib/graphql/dataloader/source.rb:173
     def batch_key_for(*batch_args, **batch_kwargs); end
   end
 end
 
-# pkg:gem/graphql#lib/graphql/dataloader/source.rb:104
+# pkg:gem/graphql#lib/graphql/dataloader/source.rb:99
 GraphQL::Dataloader::Source::MAX_ITERATIONS = T.let(T.unsafe(nil), Integer)
 
 # This error is raised when `Types::ISO8601Date` is asked to return a value
@@ -1689,7 +1704,7 @@ class GraphQL::Execution::Interpreter::Arguments
   def initialize(argument_values:, keyword_arguments: T.unsafe(nil)); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def [](*_arg0, **_arg1, &_arg2); end
+  def [](*args, **_arg1, &block); end
 
   # @return [Hash{Symbol => ArgumentValue}]
   #
@@ -1697,25 +1712,25 @@ class GraphQL::Execution::Interpreter::Arguments
   def argument_values; end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def each(*_arg0, **_arg1, &_arg2); end
+  def each(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:63
-  def each_value(*_arg0, **_arg1, &_arg2); end
+  def each_value(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:58
   def empty?; end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def fetch(*_arg0, **_arg1, &_arg2); end
+  def fetch(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:65
   def inspect; end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def key?(*_arg0, **_arg1, &_arg2); end
+  def key?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def keys(*_arg0, **_arg1, &_arg2); end
+  def keys(*args, **_arg1, &block); end
 
   # The Ruby-style arguments hash, ready for a resolver.
   # This hash is the one used at runtime.
@@ -1737,13 +1752,13 @@ class GraphQL::Execution::Interpreter::Arguments
   def merge_extras(extra_args); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def size(*_arg0, **_arg1, &_arg2); end
+  def size(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def to_h(*_arg0, **_arg1, &_arg2); end
+  def to_h(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:62
-  def values(*_arg0, **_arg1, &_arg2); end
+  def values(*args, **_arg1, &block); end
 end
 
 # pkg:gem/graphql#lib/graphql/execution/interpreter/arguments.rb:84
@@ -1849,13 +1864,13 @@ class GraphQL::Execution::Interpreter::Runtime
   # @param trace [Boolean] If `false`, don't wrap this with field tracing
   # @return [GraphQL::Execution::Lazy, Object] If loading `object` will be deferred, it's a wrapper over it.
   #
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:907
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:906
   def after_lazy(lazy_obj, field:, owner_object:, arguments:, ast_node:, result:, result_name:, runtime_state:, eager: T.unsafe(nil), trace: T.unsafe(nil), &block); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:961
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:960
   def arguments(graphql_object, arg_owner, ast_node); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:815
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:814
   def call_method_on_directives(method_name, object, directives, &block); end
 
   # @return [GraphQL::Query::Context]
@@ -1881,12 +1896,12 @@ class GraphQL::Execution::Interpreter::Runtime
   # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:540
   def current_path; end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:970
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:969
   def delete_all_interpreter_context; end
 
   # Check {Schema::Directive.include?} for each directive that's present
   #
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:854
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:853
   def directives_include?(node, graphql_object, parent_type, selection_result, extra_path_part); end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:199
@@ -1914,16 +1929,16 @@ class GraphQL::Execution::Interpreter::Runtime
   # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:212
   def gather_selections(graphql_response, owner_object, owner_type, selections, selections_to_run, selections_by_name, ordered_result_keys); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:885
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:884
   def get_current_runtime_state; end
 
   # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:62
   def inspect; end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:1002
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:1001
   def lazy?(object); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:890
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:889
   def minimal_after_lazy(value, &block); end
 
   # @return [GraphQL::Query]
@@ -1931,13 +1946,13 @@ class GraphQL::Execution::Interpreter::Runtime
   # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:30
   def query; end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:800
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:799
   def resolve_list_item(inner_value, inner_type, inner_type_non_null, ast_node, field, owner_object, arguments, this_idx, response_list, owner_type, was_scoped, runtime_state); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:981
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:980
   def resolve_type(type, value); end
 
-  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:820
+  # pkg:gem/graphql#lib/graphql/execution/interpreter/runtime.rb:819
   def run_directive(method_name, object, directives, idx, &block); end
 
   # @return [void]
@@ -2243,10 +2258,10 @@ class GraphQL::Execution::Lazy::LazyMethodMap::ConcurrentishMap
   def compute_if_absent(key); end
 
   # pkg:gem/graphql#lib/graphql/execution/lazy/lazy_method_map.rb:61
-  def each_pair(*_arg0, **_arg1, &_arg2); end
+  def each_pair(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/execution/lazy/lazy_method_map.rb:61
-  def size(*_arg0, **_arg1, &_arg2); end
+  def size(*args, **_arg1, &block); end
 
   protected
 
@@ -6883,10 +6898,10 @@ class GraphQL::Query
   def analysis_errors=(_arg0); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def analyzers(*_arg0, **_arg1, &_arg2); end
+  def analyzers(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def ast_analyzers(*_arg0, **_arg1, &_arg2); end
+  def ast_analyzers(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:65
   def context; end
@@ -6942,10 +6957,10 @@ class GraphQL::Query
   def lookahead; end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def max_complexity(*_arg0, **_arg1, &_arg2); end
+  def max_complexity(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def max_depth(*_arg0, **_arg1, &_arg2); end
+  def max_depth(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:222
   def multiplex; end
@@ -7114,10 +7129,10 @@ class GraphQL::Query
   def validate=(new_validate); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def validate_timeout_remaining(*_arg0, **_arg1, &_arg2); end
+  def validate_timeout_remaining(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:368
-  def validation_errors(*_arg0, **_arg1, &_arg2); end
+  def validation_errors(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query.rb:364
   def validation_pipeline; end
@@ -7307,7 +7322,7 @@ class GraphQL::Query::Context
   def to_hash; end
 
   # pkg:gem/graphql#lib/graphql/query/context.rb:80
-  def trace(*_arg0, **_arg1, &_arg2); end
+  def trace(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/context.rb:82
   def types; end
@@ -7452,19 +7467,19 @@ class GraphQL::Query::NullContext < ::GraphQL::Query::Context
   def initialize(schema: T.unsafe(nil)); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:27
-  def [](*_arg0, **_arg1, &_arg2); end
+  def [](*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:26
   def dataloader; end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:27
-  def dig(*_arg0, **_arg1, &_arg2); end
+  def dig(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:27
-  def fetch(*_arg0, **_arg1, &_arg2); end
+  def fetch(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:27
-  def key?(*_arg0, **_arg1, &_arg2); end
+  def key?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:26
   def query; end
@@ -7473,7 +7488,7 @@ class GraphQL::Query::NullContext < ::GraphQL::Query::Context
   def schema; end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:27
-  def to_h(*_arg0, **_arg1, &_arg2); end
+  def to_h(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/null_context.rb:26
   def warden; end
@@ -7657,19 +7672,19 @@ class GraphQL::Query::Result
   def ==(other); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:24
-  def [](*_arg0, **_arg1, &_arg2); end
+  def [](*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:24
-  def as_json(*_arg0, **_arg1, &_arg2); end
+  def as_json(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:22
-  def context(*_arg0, **_arg1, &_arg2); end
+  def context(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:39
   def inspect; end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:24
-  def keys(*_arg0, **_arg1, &_arg2); end
+  def keys(*args, **_arg1, &block); end
 
   # Delegate any hash-like method to the underlying hash.
   #
@@ -7677,7 +7692,7 @@ class GraphQL::Query::Result
   def method_missing(method_name, *args, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:22
-  def mutation?(*_arg0, **_arg1, &_arg2); end
+  def mutation?(*args, **_arg1, &block); end
 
   # @return [GraphQL::Query] The query that was executed
   #
@@ -7685,10 +7700,10 @@ class GraphQL::Query::Result
   def query; end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:22
-  def query?(*_arg0, **_arg1, &_arg2); end
+  def query?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:22
-  def subscription?(*_arg0, **_arg1, &_arg2); end
+  def subscription?(*args, **_arg1, &block); end
 
   # @return [Hash] The resulting hash of "data" and/or "errors"
   #
@@ -7696,10 +7711,10 @@ class GraphQL::Query::Result
   def to_h; end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:24
-  def to_json(*_arg0, **_arg1, &_arg2); end
+  def to_json(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/result.rb:24
-  def values(*_arg0, **_arg1, &_arg2); end
+  def values(*args, **_arg1, &block); end
 
   private
 
@@ -7826,7 +7841,7 @@ class GraphQL::Query::Variables
   def initialize(ctx, ast_variables, provided_variables); end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:66
-  def [](*_arg0, **_arg1, &_arg2); end
+  def [](*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:11
   def context; end
@@ -7837,16 +7852,16 @@ class GraphQL::Query::Variables
   def errors; end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:66
-  def fetch(*_arg0, **_arg1, &_arg2); end
+  def fetch(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:66
-  def key?(*_arg0, **_arg1, &_arg2); end
+  def key?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:66
-  def length(*_arg0, **_arg1, &_arg2); end
+  def length(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/query/variables.rb:66
-  def to_h(*_arg0, **_arg1, &_arg2); end
+  def to_h(*args, **_arg1, &block); end
 
   private
 
@@ -9407,7 +9422,7 @@ class GraphQL::Schema::Directive < ::GraphQL::Schema::Member
   # pkg:gem/graphql#lib/graphql/schema/directive.rb:129
   def arguments; end
 
-  # pkg:gem/graphql#lib/graphql/schema/directive.rb:187
+  # pkg:gem/graphql#lib/graphql/schema/directive.rb:190
   def graphql_name; end
 
   # @return [GraphQL::Schema::Field, GraphQL::Schema::Argument, Class, Module]
@@ -9417,10 +9432,10 @@ class GraphQL::Schema::Directive < ::GraphQL::Schema::Member
 
   private
 
-  # pkg:gem/graphql#lib/graphql/schema/directive.rb:277
+  # pkg:gem/graphql#lib/graphql/schema/directive.rb:280
   def assert_has_location(location); end
 
-  # pkg:gem/graphql#lib/graphql/schema/directive.rb:240
+  # pkg:gem/graphql#lib/graphql/schema/directive.rb:243
   def assert_valid_owner; end
 
   class << self
@@ -9490,10 +9505,10 @@ class GraphQL::Schema::Directive < ::GraphQL::Schema::Member
   end
 end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:206
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:209
 GraphQL::Schema::Directive::ARGUMENT_DEFINITION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:215
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:218
 GraphQL::Schema::Directive::DEFAULT_DEPRECATION_REASON = T.let(T.unsafe(nil), String)
 
 # pkg:gem/graphql#lib/graphql/schema/directive/deprecated.rb:5
@@ -9502,22 +9517,22 @@ class GraphQL::Schema::Directive::Deprecated < ::GraphQL::Schema::Directive
   extend ::GraphQL::Schema::Member::HasValidators::ClassConfigured::ClassValidators
 end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:209
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:212
 GraphQL::Schema::Directive::ENUM = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:210
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:213
 GraphQL::Schema::Directive::ENUM_VALUE = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:196
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:199
 GraphQL::Schema::Directive::FIELD = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:205
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:208
 GraphQL::Schema::Directive::FIELD_DEFINITION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:197
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:200
 GraphQL::Schema::Directive::FRAGMENT_DEFINITION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:198
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:201
 GraphQL::Schema::Directive::FRAGMENT_SPREAD = T.let(T.unsafe(nil), Symbol)
 
 # An example directive to show how you might interact with the runtime.
@@ -9608,16 +9623,16 @@ module GraphQL::Schema::Directive::Flagged::VisibleByFlag
   end
 end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:199
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:202
 GraphQL::Schema::Directive::INLINE_FRAGMENT = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:212
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:215
 GraphQL::Schema::Directive::INPUT_FIELD_DEFINITION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:211
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:214
 GraphQL::Schema::Directive::INPUT_OBJECT = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:207
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:210
 GraphQL::Schema::Directive::INTERFACE = T.let(T.unsafe(nil), Symbol)
 
 # pkg:gem/graphql#lib/graphql/schema/directive/include.rb:5
@@ -9634,16 +9649,16 @@ end
 # pkg:gem/graphql#lib/graphql/schema/directive.rb:131
 class GraphQL::Schema::Directive::InvalidArgumentError < ::GraphQL::Error; end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:191
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:194
 GraphQL::Schema::Directive::LOCATIONS = T.let(T.unsafe(nil), Array)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:216
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:219
 GraphQL::Schema::Directive::LOCATION_DESCRIPTIONS = T.let(T.unsafe(nil), Hash)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:194
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:197
 GraphQL::Schema::Directive::MUTATION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:204
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:207
 GraphQL::Schema::Directive::OBJECT = T.let(T.unsafe(nil), Symbol)
 
 # pkg:gem/graphql#lib/graphql/schema/directive/one_of.rb:5
@@ -9661,19 +9676,19 @@ module GraphQL::Schema::Directive::OneOf::IsOneOf
   def one_of?; end
 end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:193
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:196
 GraphQL::Schema::Directive::QUERY = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:192
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:195
 GraphQL::Schema::Directive::RUNTIME_LOCATIONS = T.let(T.unsafe(nil), Array)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:203
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:206
 GraphQL::Schema::Directive::SCALAR = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:202
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:205
 GraphQL::Schema::Directive::SCHEMA = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:195
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:198
 GraphQL::Schema::Directive::SUBSCRIPTION = T.let(T.unsafe(nil), Symbol)
 
 # pkg:gem/graphql#lib/graphql/schema/directive/skip.rb:5
@@ -9739,10 +9754,10 @@ class GraphQL::Schema::Directive::Transform::Transformer
   def after_resolve(field_results); end
 end
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:208
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:211
 GraphQL::Schema::Directive::UNION = T.let(T.unsafe(nil), Symbol)
 
-# pkg:gem/graphql#lib/graphql/schema/directive.rb:200
+# pkg:gem/graphql#lib/graphql/schema/directive.rb:203
 GraphQL::Schema::Directive::VARIABLE_DEFINITION = T.let(T.unsafe(nil), Symbol)
 
 # pkg:gem/graphql#lib/graphql/schema.rb:80
@@ -10645,7 +10660,7 @@ class GraphQL::Schema::InputObject < ::GraphQL::Schema::Member
   def [](key); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def any?(*_arg0, **_arg1, &_arg2); end
+  def any?(*args, **_arg1, &block); end
 
   # @return [GraphQL::Execution::Interpereter::Arguments] The underlying arguments instance
   #
@@ -10661,19 +10676,19 @@ class GraphQL::Schema::InputObject < ::GraphQL::Schema::Member
   def deconstruct_keys(keys = T.unsafe(nil)); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def each(*_arg0, **_arg1, &_arg2); end
+  def each(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def empty?(*_arg0, **_arg1, &_arg2); end
+  def empty?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:98
   def key?(key); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def keys(*_arg0, **_arg1, &_arg2); end
+  def keys(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def map(*_arg0, **_arg1, &_arg2); end
+  def map(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:66
   def prepare; end
@@ -10698,7 +10713,7 @@ class GraphQL::Schema::InputObject < ::GraphQL::Schema::Member
   def validate_for(context); end
 
   # pkg:gem/graphql#lib/graphql/schema/input_object.rb:27
-  def values(*_arg0, **_arg1, &_arg2); end
+  def values(*args, **_arg1, &block); end
 
   private
 
@@ -14252,6 +14267,9 @@ class GraphQL::Schema::Wrapper
   # pkg:gem/graphql#lib/graphql/schema/wrapper.rb:25
   def ==(other); end
 
+  # pkg:gem/graphql#lib/graphql/schema/wrapper.rb:29
+  def deconstruct_keys(_keys); end
+
   # pkg:gem/graphql#lib/graphql/schema/wrapper.rb:19
   def freeze; end
 
@@ -14545,13 +14563,13 @@ class GraphQL::StaticValidation::DefinitionDependencies::NodeWithPath
   def initialize(node, path); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/definition_dependencies.rb:106
-  def eql?(*_arg0, **_arg1, &_arg2); end
+  def eql?(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/definition_dependencies.rb:106
-  def hash(*_arg0, **_arg1, &_arg2); end
+  def hash(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/definition_dependencies.rb:106
-  def name(*_arg0, **_arg1, &_arg2); end
+  def name(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/definition_dependencies.rb:100
   def node; end
@@ -15595,28 +15613,28 @@ class GraphQL::StaticValidation::ValidationContext
   def initialize(query, visitor_class, max_errors); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def argument_definition(*_arg0, **_arg1, &_arg2); end
+  def argument_definition(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def dependencies(*_arg0, **_arg1, &_arg2); end
+  def dependencies(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:53
   def did_you_mean_suggestion(name, options); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def directive_definition(*_arg0, **_arg1, &_arg2); end
+  def directive_definition(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:19
-  def document(*_arg0, **_arg1, &_arg2); end
+  def document(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:14
   def errors; end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def field_definition(*_arg0, **_arg1, &_arg2); end
+  def field_definition(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:19
-  def fragments(*_arg0, **_arg1, &_arg2); end
+  def fragments(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:14
   def max_errors; end
@@ -15628,13 +15646,13 @@ class GraphQL::StaticValidation::ValidationContext
   def on_dependency_resolve_handlers; end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:19
-  def operations(*_arg0, **_arg1, &_arg2); end
+  def operations(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def parent_type_definition(*_arg0, **_arg1, &_arg2); end
+  def parent_type_definition(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def path(*_arg0, **_arg1, &_arg2); end
+  def path(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:14
   def query; end
@@ -15649,7 +15667,7 @@ class GraphQL::StaticValidation::ValidationContext
   def too_many_errors?; end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:33
-  def type_definition(*_arg0, **_arg1, &_arg2); end
+  def type_definition(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/static_validation/validation_context.rb:14
   def types; end
@@ -19659,7 +19677,7 @@ module GraphQL::Types::Relay::ConnectionBehaviors
   mixes_in_class_methods ::GraphQL::Types::Relay::ConnectionBehaviors::ClassMethods
 
   # pkg:gem/graphql#lib/graphql/types/relay/connection_behaviors.rb:8
-  def cursor_from_node(*_arg0, **_arg1, &_arg2); end
+  def cursor_from_node(*args, **_arg1, &block); end
 
   # pkg:gem/graphql#lib/graphql/types/relay/connection_behaviors.rb:196
   def edges; end
@@ -19668,7 +19686,7 @@ module GraphQL::Types::Relay::ConnectionBehaviors
   def nodes; end
 
   # pkg:gem/graphql#lib/graphql/types/relay/connection_behaviors.rb:8
-  def parent(*_arg0, **_arg1, &_arg2); end
+  def parent(*args, **_arg1, &block); end
 
   class << self
     # pkg:gem/graphql#lib/graphql/types/relay/connection_behaviors.rb:191
diff --git a/sorbet/rbi/gems/parallel@1.28.0.rbi b/sorbet/rbi/gems/parallel@2.1.0.rbi
similarity index 51%
rename from sorbet/rbi/gems/parallel@1.28.0.rbi
rename to sorbet/rbi/gems/parallel@2.1.0.rbi
index a8a657183..f785286cf 100644
--- a/sorbet/rbi/gems/parallel@1.28.0.rbi
+++ b/sorbet/rbi/gems/parallel@2.1.0.rbi
@@ -8,221 +8,272 @@
 # pkg:gem/parallel#lib/parallel/version.rb:2
 module Parallel
   class << self
-    # pkg:gem/parallel#lib/parallel.rb:254
+    # pkg:gem/parallel#lib/parallel.rb:256
     def all?(*args, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:249
+    # pkg:gem/parallel#lib/parallel.rb:251
     def any?(*args, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:245
+    # pkg:gem/parallel#lib/parallel.rb:247
     def each(array, options = T.unsafe(nil), &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:259
+    # pkg:gem/parallel#lib/parallel.rb:261
     def each_with_index(array, options = T.unsafe(nil), &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:318
+    # pkg:gem/parallel#lib/parallel.rb:320
     def filter_map(*_arg0, **_arg1, &_arg2); end
 
-    # pkg:gem/parallel#lib/parallel.rb:314
+    # pkg:gem/parallel#lib/parallel.rb:316
     def flat_map(*_arg0, **_arg1, &_arg2); end
 
-    # pkg:gem/parallel#lib/parallel.rb:239
+    # pkg:gem/parallel#lib/parallel.rb:241
     def in_processes(options = T.unsafe(nil), &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:223
+    # pkg:gem/parallel#lib/parallel.rb:225
     def in_threads(options = T.unsafe(nil)); end
 
-    # pkg:gem/parallel#lib/parallel.rb:263
+    # pkg:gem/parallel#lib/parallel.rb:265
     def map(source, options = T.unsafe(nil), &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:310
+    # pkg:gem/parallel#lib/parallel.rb:312
     def map_with_index(array, options = T.unsafe(nil), &block); end
 
     # Number of physical processor cores on the current system.
     #
-    # pkg:gem/parallel#lib/parallel.rb:323
+    # pkg:gem/parallel#lib/parallel.rb:325
     def physical_processor_count; end
 
     # Number of processors seen by the OS or value considering CPU quota if the process is inside a cgroup,
     # used for process scheduling
     #
-    # pkg:gem/parallel#lib/parallel.rb:353
+    # pkg:gem/parallel#lib/parallel.rb:355
     def processor_count; end
 
-    # pkg:gem/parallel#lib/parallel.rb:357
+    # pkg:gem/parallel#lib/parallel.rb:359
     def worker_number; end
 
     # TODO: this does not work when doing threads in forks, so should remove and yield the number instead if needed
     #
-    # pkg:gem/parallel#lib/parallel.rb:362
+    # pkg:gem/parallel#lib/parallel.rb:364
     def worker_number=(worker_num); end
 
     private
 
-    # pkg:gem/parallel#lib/parallel.rb:395
+    # pkg:gem/parallel#lib/parallel.rb:397
     def add_progress_bar!(job_factory, options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:710
+    # pkg:gem/parallel#lib/parallel.rb:738
     def available_processor_count; end
 
-    # pkg:gem/parallel#lib/parallel.rb:658
+    # pkg:gem/parallel#lib/parallel.rb:686
     def call_with_index(item, index, options, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:590
+    # pkg:gem/parallel#lib/parallel.rb:616
     def create_workers(job_factory, options, &block); end
 
     # options is either a Integer or a Hash with :count
     #
-    # pkg:gem/parallel#lib/parallel.rb:648
+    # pkg:gem/parallel#lib/parallel.rb:676
     def extract_count_from_options(options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:676
+    # pkg:gem/parallel#lib/parallel.rb:704
     def instrument_finish(item, index, result, options); end
 
     # yield results in the order of the input items
     # needs to use `options` to store state between executions
     # needs to use `done` index since a nil result would also be valid
     #
-    # pkg:gem/parallel#lib/parallel.rb:685
+    # pkg:gem/parallel#lib/parallel.rb:713
     def instrument_finish_in_order(item, index, result, options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:705
+    # pkg:gem/parallel#lib/parallel.rb:733
     def instrument_start(item, index, options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:368
+    # pkg:gem/parallel#lib/parallel.rb:370
     def physical_processor_count_windows; end
 
-    # pkg:gem/parallel#lib/parallel.rb:624
+    # pkg:gem/parallel#lib/parallel.rb:651
     def process_incoming_jobs(read, write, job_factory, options, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:578
+    # pkg:gem/parallel#lib/parallel.rb:526
+    def ractor_build(use_port); end
+
+    # pkg:gem/parallel#lib/parallel.rb:547
+    def ractor_result(item, index, result, results, results_mutex, options); end
+
+    # pkg:gem/parallel#lib/parallel.rb:552
+    def ractor_stop(ractor); end
+
+    # pkg:gem/parallel#lib/parallel.rb:604
     def replace_worker(job_factory, workers, index, options, blk); end
 
-    # pkg:gem/parallel#lib/parallel.rb:389
+    # pkg:gem/parallel#lib/parallel.rb:391
     def run(command); end
 
-    # pkg:gem/parallel#lib/parallel.rb:669
+    # pkg:gem/parallel#lib/parallel.rb:697
     def with_instrumentation(item, index, options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:420
+    # pkg:gem/parallel#lib/parallel.rb:422
     def work_direct(job_factory, options, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:530
+    # pkg:gem/parallel#lib/parallel.rb:556
     def work_in_processes(job_factory, options, &blk); end
 
-    # pkg:gem/parallel#lib/parallel.rb:464
+    # pkg:gem/parallel#lib/parallel.rb:466
     def work_in_ractors(job_factory, options); end
 
-    # pkg:gem/parallel#lib/parallel.rb:439
+    # pkg:gem/parallel#lib/parallel.rb:441
     def work_in_threads(job_factory, options, &block); end
 
-    # pkg:gem/parallel#lib/parallel.rb:598
+    # pkg:gem/parallel#lib/parallel.rb:624
     def worker(job_factory, options, &block); end
   end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:11
+# pkg:gem/parallel#lib/parallel.rb:12
 class Parallel::Break < ::StandardError
-  # pkg:gem/parallel#lib/parallel.rb:14
+  # pkg:gem/parallel#lib/parallel.rb:15
   def initialize(value = T.unsafe(nil)); end
 
   # marshal_dump that is used for ruby exceptions
   # avoid dumping the cause since nobody needs that and it can include undumpable exceptions
   #
-  # pkg:gem/parallel#lib/parallel.rb:21
+  # pkg:gem/parallel#lib/parallel.rb:22
   def _dump(_depth); end
 
-  # pkg:gem/parallel#lib/parallel.rb:12
+  # pkg:gem/parallel#lib/parallel.rb:13
   def value; end
 
   class << self
     # marshal_load that is used for ruby exceptions
     #
-    # pkg:gem/parallel#lib/parallel.rb:26
+    # pkg:gem/parallel#lib/parallel.rb:27
     def _load(data); end
   end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:8
+# pkg:gem/parallel#lib/parallel.rb:9
 class Parallel::DeadWorker < ::StandardError; end
 
-# pkg:gem/parallel#lib/parallel.rb:43
+# pkg:gem/parallel#lib/parallel.rb:44
 class Parallel::ExceptionWrapper
-  # pkg:gem/parallel#lib/parallel.rb:46
+  # pkg:gem/parallel#lib/parallel.rb:47
   def initialize(exception); end
 
-  # pkg:gem/parallel#lib/parallel.rb:44
+  # pkg:gem/parallel#lib/parallel.rb:45
   def exception; end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:109
+# pkg:gem/parallel#lib/parallel.rb:111
 class Parallel::JobFactory
-  # pkg:gem/parallel#lib/parallel.rb:110
+  # pkg:gem/parallel#lib/parallel.rb:112
   def initialize(source, mutex); end
 
-  # pkg:gem/parallel#lib/parallel.rb:118
+  # pkg:gem/parallel#lib/parallel.rb:120
   def next; end
 
   # generate item that is sent to workers
   # just index is faster + less likely to blow up with unserializable errors
   #
-  # pkg:gem/parallel#lib/parallel.rb:147
+  # pkg:gem/parallel#lib/parallel.rb:149
   def pack(item, index); end
 
-  # pkg:gem/parallel#lib/parallel.rb:137
+  # pkg:gem/parallel#lib/parallel.rb:139
   def size; end
 
   # unpack item that is sent to workers
   #
-  # pkg:gem/parallel#lib/parallel.rb:152
+  # pkg:gem/parallel#lib/parallel.rb:154
   def unpack(data); end
 
   private
 
-  # pkg:gem/parallel#lib/parallel.rb:158
+  # pkg:gem/parallel#lib/parallel.rb:160
   def producer?; end
 
-  # pkg:gem/parallel#lib/parallel.rb:162
+  # pkg:gem/parallel#lib/parallel.rb:164
   def queue_wrapper(array); end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:31
+# pkg:gem/parallel#lib/parallel.rb:32
 class Parallel::Kill < ::Parallel::Break; end
 
-# pkg:gem/parallel#lib/parallel.rb:6
+# Pluggable wire serializers. Each must respond to `dump(data, io)` /
+# `load(io)` (used directly by Worker) and `dump(data)` / `load(string)`
+# (used by wrappers like Hmac).
+#
+# pkg:gem/parallel#lib/parallel/serializer.rb:9
+module Parallel::Serializer; end
+
+# Wraps any inner serializer with a length-prefixed HMAC-SHA256 frame keyed
+# on a per-worker secret generated before fork. Forged frames from a
+# pipe-injector fail verification.
+#
+# pkg:gem/parallel#lib/parallel/serializer.rb:17
+class Parallel::Serializer::Hmac
+  # SHA256
+  #
+  # pkg:gem/parallel#lib/parallel/serializer.rb:22
+  def initialize(inner: T.unsafe(nil), secret: T.unsafe(nil)); end
+
+  # pkg:gem/parallel#lib/parallel/serializer.rb:27
+  def dump(data, io); end
+
+  # pkg:gem/parallel#lib/parallel/serializer.rb:33
+  def load(io); end
+end
+
+# 32-bit big-endian unsigned int
+#
+# pkg:gem/parallel#lib/parallel/serializer.rb:19
+Parallel::Serializer::Hmac::LENGTH_BYTES = T.let(T.unsafe(nil), Integer)
+
+# pkg:gem/parallel#lib/parallel/serializer.rb:18
+Parallel::Serializer::Hmac::LENGTH_FORMAT = T.let(T.unsafe(nil), String)
+
+# pkg:gem/parallel#lib/parallel/serializer.rb:20
+Parallel::Serializer::Hmac::MAC_BYTES = T.let(T.unsafe(nil), Integer)
+
+# Raw Marshal. Fast but trusts anything written to the pipe — a same-UID
+# attacker that reopens /proc/<pid>/fd/<n> can inject Marshal gadgets (RCE).
+#
+# pkg:gem/parallel#lib/parallel/serializer.rb:12
+Parallel::Serializer::Marshal = Marshal
+
+# pkg:gem/parallel#lib/parallel.rb:7
 Parallel::Stop = T.let(T.unsafe(nil), Object)
 
-# pkg:gem/parallel#lib/parallel.rb:34
+# pkg:gem/parallel#lib/parallel.rb:35
 class Parallel::UndumpableException < ::StandardError
-  # pkg:gem/parallel#lib/parallel.rb:37
+  # pkg:gem/parallel#lib/parallel.rb:38
   def initialize(original); end
 
-  # pkg:gem/parallel#lib/parallel.rb:35
+  # pkg:gem/parallel#lib/parallel.rb:36
   def backtrace; end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:167
+# pkg:gem/parallel#lib/parallel.rb:169
 class Parallel::UserInterruptHandler
   class << self
-    # pkg:gem/parallel#lib/parallel.rb:192
+    # pkg:gem/parallel#lib/parallel.rb:194
     def kill(thing); end
 
     # kill all these pids or threads if user presses Ctrl+c
     #
-    # pkg:gem/parallel#lib/parallel.rb:172
+    # pkg:gem/parallel#lib/parallel.rb:174
     def kill_on_ctrl_c(pids, options); end
 
     private
 
-    # pkg:gem/parallel#lib/parallel.rb:216
+    # pkg:gem/parallel#lib/parallel.rb:218
     def restore_interrupt(old, signal); end
 
-    # pkg:gem/parallel#lib/parallel.rb:201
+    # pkg:gem/parallel#lib/parallel.rb:203
     def trap_interrupt(signal); end
   end
 end
 
-# pkg:gem/parallel#lib/parallel.rb:168
+# pkg:gem/parallel#lib/parallel.rb:170
 Parallel::UserInterruptHandler::INTERRUPT_SIGNAL = T.let(T.unsafe(nil), Symbol)
 
 # pkg:gem/parallel#lib/parallel/version.rb:3
@@ -231,40 +282,40 @@ Parallel::VERSION = T.let(T.unsafe(nil), String)
 # pkg:gem/parallel#lib/parallel/version.rb:3
 Parallel::Version = T.let(T.unsafe(nil), String)
 
-# pkg:gem/parallel#lib/parallel.rb:62
+# pkg:gem/parallel#lib/parallel.rb:63
 class Parallel::Worker
-  # pkg:gem/parallel#lib/parallel.rb:66
-  def initialize(read, write, pid); end
+  # pkg:gem/parallel#lib/parallel.rb:67
+  def initialize(read, write, pid, serializer); end
 
   # might be passed to started_processes and simultaneously closed by another thread
   # when running in isolation mode, so we have to check if it is closed before closing
   #
-  # pkg:gem/parallel#lib/parallel.rb:79
+  # pkg:gem/parallel#lib/parallel.rb:81
   def close_pipes; end
 
-  # pkg:gem/parallel#lib/parallel.rb:63
+  # pkg:gem/parallel#lib/parallel.rb:64
   def pid; end
 
-  # pkg:gem/parallel#lib/parallel.rb:63
+  # pkg:gem/parallel#lib/parallel.rb:64
   def read; end
 
-  # pkg:gem/parallel#lib/parallel.rb:72
+  # pkg:gem/parallel#lib/parallel.rb:74
   def stop; end
 
-  # pkg:gem/parallel#lib/parallel.rb:64
+  # pkg:gem/parallel#lib/parallel.rb:65
   def thread; end
 
-  # pkg:gem/parallel#lib/parallel.rb:64
+  # pkg:gem/parallel#lib/parallel.rb:65
   def thread=(_arg0); end
 
-  # pkg:gem/parallel#lib/parallel.rb:84
+  # pkg:gem/parallel#lib/parallel.rb:86
   def work(data); end
 
-  # pkg:gem/parallel#lib/parallel.rb:63
+  # pkg:gem/parallel#lib/parallel.rb:64
   def write; end
 
   private
 
-  # pkg:gem/parallel#lib/parallel.rb:102
+  # pkg:gem/parallel#lib/parallel.rb:104
   def wait; end
 end
diff --git a/sorbet/rbi/gems/parser@3.3.11.1.rbi b/sorbet/rbi/gems/parser@3.3.12.0.rbi
similarity index 100%
rename from sorbet/rbi/gems/parser@3.3.11.1.rbi
rename to sorbet/rbi/gems/parser@3.3.12.0.rbi
diff --git a/sorbet/rbi/gems/rbs@4.0.3.rbi b/sorbet/rbi/gems/rbs@4.1.0.rbi
similarity index 91%
rename from sorbet/rbi/gems/rbs@4.0.3.rbi
rename to sorbet/rbi/gems/rbs@4.1.0.rbi
index 9598bd345..3ee5c975d 100644
--- a/sorbet/rbi/gems/rbs@4.0.3.rbi
+++ b/sorbet/rbi/gems/rbs@4.1.0.rbi
@@ -5,25 +5,29 @@
 # Please instead update this file by running `bin/tapioca gem rbs`.
 
 
+# This file is generated by the templates/template.rb script and should not be
+# modified manually. To change the template see
+#   templates/lib/rbs/wasm/serialization_schema.rb.erb
+#
 # pkg:gem/rbs#lib/rbs/version.rb:3
 module RBS
   class << self
-    # pkg:gem/rbs#lib/rbs.rb:80
+    # pkg:gem/rbs#lib/rbs.rb:92
     def logger; end
 
-    # pkg:gem/rbs#lib/rbs.rb:77
+    # pkg:gem/rbs#lib/rbs.rb:89
     def logger_level; end
 
-    # pkg:gem/rbs#lib/rbs.rb:89
+    # pkg:gem/rbs#lib/rbs.rb:101
     def logger_level=(level); end
 
-    # pkg:gem/rbs#lib/rbs.rb:78
+    # pkg:gem/rbs#lib/rbs.rb:90
     def logger_output; end
 
-    # pkg:gem/rbs#lib/rbs.rb:84
+    # pkg:gem/rbs#lib/rbs.rb:96
     def logger_output=(val); end
 
-    # pkg:gem/rbs#lib/rbs.rb:94
+    # pkg:gem/rbs#lib/rbs.rb:106
     def print_warning; end
   end
 end
@@ -865,45 +869,45 @@ class RBS::AST::Ruby::Annotations::Base
   def prefix_location; end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:356
+# pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:398
 class RBS::AST::Ruby::Annotations::BlockParamTypeAnnotation < ::RBS::AST::Ruby::Annotations::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:359
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:401
   def initialize(location:, prefix_location:, ampersand_location:, name_location:, colon_location:, question_location:, type_location:, type:, comment_location:); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def ampersand_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def colon_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def comment_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:370
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:412
   def map_type_name(&block); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:384
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:426
   def name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def name_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:388
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:430
   def optional?; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def question_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:392
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:434
   def required?; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def type; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:396
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:438
   def type_fingerprint; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:399
   def type_location; end
 end
 
@@ -1015,6 +1019,42 @@ class RBS::AST::Ruby::Annotations::ModuleAliasAnnotation < ::RBS::AST::Ruby::Ann
   def type_fingerprint; end
 end
 
+# pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:356
+class RBS::AST::Ruby::Annotations::ModuleSelfAnnotation < ::RBS::AST::Ruby::Annotations::Base
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:359
+  def initialize(location:, prefix_location:, keyword_location:, colon_location:, name:, args:, open_bracket_location:, close_bracket_location:, args_comma_locations:, comment_location:); end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def args; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def args_comma_locations; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def close_bracket_location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def colon_location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def comment_location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def keyword_location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:371
+  def map_type_name; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def name; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:357
+  def open_bracket_location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:388
+  def type_fingerprint; end
+end
+
 # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:20
 class RBS::AST::Ruby::Annotations::NodeTypeAssertion < ::RBS::AST::Ruby::Annotations::Base
   # pkg:gem/rbs#lib/rbs/ast/ruby/annotations.rb:23
@@ -1146,34 +1186,34 @@ class RBS::AST::Ruby::CommentBlock
   # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:9
   def initialize(source_buffer, comments); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:226
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:228
   def as_comment; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:7
   def comment_buffer; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:211
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:213
   def comments; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:100
   def each_paragraph(variables, &block); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:50
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:52
   def end_line; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:36
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:38
   def leading?; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:215
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:217
   def leading_annotation?(index); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:174
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:176
   def line_location(start_line, end_line); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:54
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:56
   def line_starts; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:180
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:182
   def location; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:7
@@ -1182,61 +1222,61 @@ class RBS::AST::Ruby::CommentBlock
   # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:7
   def offsets; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:187
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:189
   def parse_annotation_lines(start_line, end_line, variables); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:46
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:48
   def start_line; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:169
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:171
   def text(comment_index); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:41
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:43
   def trailing?; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:197
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:199
   def trailing_annotation(variables); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:130
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:132
   def yield_annotation(start_line, end_line, current_line, variables, &block); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:110
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:112
   def yield_paragraph(start_line, current_line, variables, &block); end
 
   class << self
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:60
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:62
     def build(buffer, comments); end
   end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+# pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
 class RBS::AST::Ruby::CommentBlock::AnnotationSyntaxError < ::Struct
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
   def error; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
   def error=(_); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+  # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
   def location=(_); end
 
   class << self
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
     def [](*_arg0); end
 
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
     def inspect; end
 
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
     def keyword_init?; end
 
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
     def members; end
 
-    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:96
+    # pkg:gem/rbs#lib/rbs/ast/ruby/comment_block.rb:98
     def new(*_arg0); end
   end
 end
@@ -1322,72 +1362,72 @@ class RBS::AST::Ruby::Declarations::ClassDecl::SuperClass
   def type_name_location; end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:223
+# pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:233
 class RBS::AST::Ruby::Declarations::ClassModuleAliasDecl < ::RBS::AST::Ruby::Declarations::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:230
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:240
   def initialize(buffer, node, new_name, infered_old_name, leading_comment, annotation); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:228
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:238
   def annotation; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:264
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:274
   def comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:227
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:237
   def infered_old_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:225
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:235
   def leading_comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:239
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:249
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:243
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:253
   def name_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:226
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:236
   def new_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:224
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:234
   def node; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:252
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:262
   def old_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:268
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:278
   def type_fingerprint; end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:161
+# pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:171
 class RBS::AST::Ruby::Declarations::ConstantDecl < ::RBS::AST::Ruby::Declarations::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:167
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:177
   def initialize(buffer, constant_name, node, leading_comment, type_annotation); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:209
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:219
   def comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:163
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:173
   def constant_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:162
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:172
   def leading_comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:175
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:185
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:179
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:189
   def name_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:164
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:174
   def node; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:188
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:198
   def type; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:165
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:175
   def type_annotation; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:213
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:223
   def type_fingerprint; end
 end
 
@@ -1399,7 +1439,7 @@ class RBS::AST::Ruby::Declarations::ModuleDecl < ::RBS::AST::Ruby::Declarations:
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:128
   def each_decl(&block); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:142
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:152
   def location; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:117
@@ -1408,7 +1448,7 @@ class RBS::AST::Ruby::Declarations::ModuleDecl < ::RBS::AST::Ruby::Declarations:
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:115
   def module_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:146
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:156
   def name_location; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:119
@@ -1417,7 +1457,7 @@ class RBS::AST::Ruby::Declarations::ModuleDecl < ::RBS::AST::Ruby::Declarations:
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:140
   def self_types; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:150
+  # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:160
   def type_fingerprint; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/declarations.rb:138
@@ -1449,45 +1489,45 @@ end
 # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:6
 module RBS::AST::Ruby::Members; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:690
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:701
 class RBS::AST::Ruby::Members::AttrAccessorMember < ::RBS::AST::Ruby::Members::AttributeMember; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:684
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:695
 class RBS::AST::Ruby::Members::AttrReaderMember < ::RBS::AST::Ruby::Members::AttributeMember; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:687
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:698
 class RBS::AST::Ruby::Members::AttrWriterMember < ::RBS::AST::Ruby::Members::AttributeMember; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:639
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:650
 class RBS::AST::Ruby::Members::AttributeMember < ::RBS::AST::Ruby::Members::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:645
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:656
   def initialize(buffer, node, name_nodes, leading_comment, type_annotation); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:643
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:654
   def leading_comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:659
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:670
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:663
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:674
   def name_locations; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:641
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:652
   def name_nodes; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:653
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:664
   def names; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:640
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:651
   def node; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:669
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:680
   def type; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:642
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:653
   def type_annotation; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:673
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:684
   def type_fingerprint; end
 end
 
@@ -1504,67 +1544,76 @@ end
 
 # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:547
 class RBS::AST::Ruby::Members::DefMember < ::RBS::AST::Ruby::Members::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:555
-  def initialize(buffer, name, node, method_type, leading_comment); end
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:556
+  def initialize(buffer, name, node, method_type, leading_comment, kind: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:575
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:585
   def annotations; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:553
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:569
+  def instance?; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:552
+  def kind; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:554
   def leading_comment; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:563
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:573
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:552
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:553
   def method_type; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:550
   def name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:579
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:589
   def name_location; end
 
   # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:551
   def node; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:571
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:581
   def overloading?; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:567
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:577
   def overloads; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:583
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:565
+  def singleton?; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:593
   def type_fingerprint; end
 end
 
 # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:548
 RBS::AST::Ruby::Members::DefMember::Overload = RBS::AST::Members::MethodDefinition::Overload
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:633
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:644
 class RBS::AST::Ruby::Members::ExtendMember < ::RBS::AST::Ruby::Members::MixinMember; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:630
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:641
 class RBS::AST::Ruby::Members::IncludeMember < ::RBS::AST::Ruby::Members::MixinMember; end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:693
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:704
 class RBS::AST::Ruby::Members::InstanceVariableMember < ::RBS::AST::Ruby::Members::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:696
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:707
   def initialize(buffer, annotation); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:694
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:705
   def annotation; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:709
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:720
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:701
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:712
   def name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:705
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:716
   def type; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:713
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:724
   def type_fingerprint; end
 end
 
@@ -1659,34 +1708,55 @@ class RBS::AST::Ruby::Members::MethodTypeAnnotation::DocStyle
   end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:593
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:604
 class RBS::AST::Ruby::Members::MixinMember < ::RBS::AST::Ruby::Members::Base
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:598
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:609
   def initialize(buffer, node, module_name, annotation); end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:596
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:607
   def annotation; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:605
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:616
   def location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:595
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:606
   def module_name; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:609
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:620
   def name_location; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:594
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:605
   def node; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:616
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:627
   def type_args; end
 
-  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:620
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:631
+  def type_fingerprint; end
+end
+
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:732
+class RBS::AST::Ruby::Members::ModuleSelfMember < ::RBS::AST::Ruby::Members::Base
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:735
+  def initialize(buffer, annotation); end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:733
+  def annotation; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:744
+  def args; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:748
+  def location; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:740
+  def name; end
+
+  # pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:752
   def type_fingerprint; end
 end
 
-# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:636
+# pkg:gem/rbs#lib/rbs/ast/ruby/members.rb:647
 class RBS::AST::Ruby::Members::PrependMember < ::RBS::AST::Ruby::Members::MixinMember; end
 
 # pkg:gem/rbs#lib/rbs/ast/type_param.rb:5
@@ -1950,13 +2020,16 @@ class RBS::Buffer
   # pkg:gem/rbs#lib/rbs/buffer.rb:9
   def initialize(content:, name: T.unsafe(nil), parent: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:131
+  # pkg:gem/rbs#lib/rbs/buffer.rb:168
   def absolute_position(position); end
 
+  # pkg:gem/rbs#lib/rbs/buffer.rb:90
+  def character_offset(byte_offset); end
+
   # pkg:gem/rbs#lib/rbs/buffer.rb:6
   def content; end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:148
+  # pkg:gem/rbs#lib/rbs/buffer.rb:185
   def detach; end
 
   # pkg:gem/rbs#lib/rbs/buffer.rb:86
@@ -1980,10 +2053,10 @@ class RBS::Buffer
   # pkg:gem/rbs#lib/rbs/buffer.rb:7
   def parent; end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:116
+  # pkg:gem/rbs#lib/rbs/buffer.rb:153
   def parent_buffer; end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:122
+  # pkg:gem/rbs#lib/rbs/buffer.rb:159
   def parent_position(position); end
 
   # pkg:gem/rbs#lib/rbs/buffer.rb:56
@@ -1992,13 +2065,13 @@ class RBS::Buffer
   # pkg:gem/rbs#lib/rbs/buffer.rb:30
   def ranges; end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:90
+  # pkg:gem/rbs#lib/rbs/buffer.rb:114
   def rbs_location(location, loc2 = T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:98
-  def sub_buffer(lines:); end
+  # pkg:gem/rbs#lib/rbs/buffer.rb:123
+  def sub_buffer(lines:, byte_lines_hint: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/buffer.rb:140
+  # pkg:gem/rbs#lib/rbs/buffer.rb:177
   def top_buffer; end
 end
 
@@ -2250,49 +2323,49 @@ end
 
 # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:6
 class RBS::Collection::Config::LockfileGenerator
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:48
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:59
   def initialize(config:, definition:, with_lockfile:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def config; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def definition; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def existing_lockfile; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def gem_entries; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def gem_hash; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:76
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:87
   def generate; end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:40
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:51
   def lockfile; end
 
   private
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:109
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:120
   def assign_gem(name:, version:, skip: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:175
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:188
   def assign_stdlib(name:, from_gem: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:246
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:259
   def find_best_version(version:, versions:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:240
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:253
   def find_source(name:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:101
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:112
   def validate_gemfile_lock_path!(lock:, gemfile_lock_path:); end
 
   class << self
-    # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:42
+    # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:53
     def generate(config:, definition:, with_lockfile: T.unsafe(nil)); end
   end
 end
@@ -2300,15 +2373,18 @@ end
 # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:7
 RBS::Collection::Config::LockfileGenerator::ALUMNI_STDLIBS = T.let(T.unsafe(nil), Hash)
 
-# pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:24
+# pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:35
 class RBS::Collection::Config::LockfileGenerator::GemfileLockMismatchError < ::StandardError
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:25
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:36
   def initialize(expected:, actual:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:30
+  # pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:41
   def message; end
 end
 
+# pkg:gem/rbs#lib/rbs/collection/config/lockfile_generator.rb:24
+RBS::Collection::Config::LockfileGenerator::NONGEM_STDLIBS = T.let(T.unsafe(nil), Set)
+
 # pkg:gem/rbs#lib/rbs/collection/config.rb:17
 RBS::Collection::Config::PATH = T.let(T.unsafe(nil), Pathname)
 
@@ -2354,13 +2430,13 @@ class RBS::Collection::Sources::Git
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:44
   def install(dest:, name:, version:, stdout:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:224
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:230
   def load_metadata(dir:); end
 
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:74
   def manifest_of(name, version); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:208
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:214
   def metadata_content(name:, version:); end
 
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:17
@@ -2372,7 +2448,7 @@ class RBS::Collection::Sources::Git
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:17
   def repo_dir; end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:173
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:179
   def resolved_revision; end
 
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:17
@@ -2384,7 +2460,7 @@ class RBS::Collection::Sources::Git
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:37
   def versions(name); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:216
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:222
   def write_metadata(dir:, name:, version:); end
 
   private
@@ -2392,7 +2468,7 @@ class RBS::Collection::Sources::Git
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:88
   def _install(dest:, name:, version:); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:184
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:190
   def commit_hash?; end
 
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:100
@@ -2401,28 +2477,28 @@ class RBS::Collection::Sources::Git
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:124
   def format_config_entry(name, version); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:169
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:175
   def gem_repo_dir; end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:230
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:236
   def gems_versions; end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:188
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:194
   def git(*cmd, **opt); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:192
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:198
   def git?(*cmd, **opt); end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:159
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:165
   def git_dir; end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:153
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:159
   def need_to_fetch?(revision); end
 
   # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:131
   def setup!; end
 
-  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:198
+  # pkg:gem/rbs#lib/rbs/collection/sources/git.rb:204
   def sh!(*cmd, **opt); end
 end
 
@@ -2475,7 +2551,6 @@ end
 # pkg:gem/rbs#lib/rbs/collection/sources/rubygems.rb:9
 class RBS::Collection::Sources::Rubygems
   include ::RBS::Collection::Sources::Base
-  include ::Singleton::SingletonInstanceMethods
   include ::Singleton
   extend ::Singleton::SingletonClassMethods
 
@@ -2515,7 +2590,6 @@ end
 # pkg:gem/rbs#lib/rbs/collection/sources/stdlib.rb:9
 class RBS::Collection::Sources::Stdlib
   include ::RBS::Collection::Sources::Base
-  include ::Singleton::SingletonInstanceMethods
   include ::Singleton
   extend ::Singleton::SingletonClassMethods
 
@@ -3118,28 +3192,28 @@ class RBS::DefinitionBuilder::MethodBuilder
   # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:91
   def initialize(env:); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:211
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:217
   def build_alias(methods, type, member:); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:216
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:222
   def build_attribute(methods, type, member:, accessibility:); end
 
   # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:99
   def build_instance(type_name); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:191
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:197
   def build_interface(type_name); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:250
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:256
   def build_method(methods, type, member:, accessibility:); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:232
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:238
   def build_ruby_attribute(methods, type, member:, accessibility:); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:162
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:164
   def build_singleton(type_name); end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:261
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:267
   def each_rbs_member_with_accessibility(members, accessibility: T.unsafe(nil)); end
 
   # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:86
@@ -3154,7 +3228,7 @@ class RBS::DefinitionBuilder::MethodBuilder
   # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:88
   def singleton_methods; end
 
-  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:274
+  # pkg:gem/rbs#lib/rbs/definition_builder/method_builder.rb:280
   def update(env:, except:); end
 end
 
@@ -3322,10 +3396,10 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:48
   def initialize; end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:981
+  # pkg:gem/rbs#lib/rbs/environment.rb:988
   def absolute_type(resolver, map, type, context:); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:976
+  # pkg:gem/rbs#lib/rbs/environment.rb:983
   def absolute_type_name(resolver, map, type_name, context:); end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:455
@@ -3334,7 +3408,7 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:568
   def append_context(context, decl); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:992
+  # pkg:gem/rbs#lib/rbs/environment.rb:999
   def buffers; end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:117
@@ -3382,7 +3456,7 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:374
   def insert_ruby_decl(decl, context:, namespace:); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:987
+  # pkg:gem/rbs#lib/rbs/environment.rb:994
   def inspect; end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:6
@@ -3442,10 +3516,10 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:577
   def resolve_declaration(resolver, map, decl, context:, prefix:); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:862
+  # pkg:gem/rbs#lib/rbs/environment.rb:869
   def resolve_member(resolver, map, member, context:); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:962
+  # pkg:gem/rbs#lib/rbs/environment.rb:969
   def resolve_method_type(resolver, map, type, context:); end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:713
@@ -3460,7 +3534,7 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:522
   def resolve_type_names(only: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:970
+  # pkg:gem/rbs#lib/rbs/environment.rb:977
   def resolve_type_params(resolver, map, params, context:); end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:562
@@ -3478,7 +3552,7 @@ class RBS::Environment
   # pkg:gem/rbs#lib/rbs/environment.rb:87
   def type_name?(name); end
 
-  # pkg:gem/rbs#lib/rbs/environment.rb:996
+  # pkg:gem/rbs#lib/rbs/environment.rb:1003
   def unload(paths); end
 
   # pkg:gem/rbs#lib/rbs/environment.rb:494
@@ -3995,31 +4069,31 @@ class RBS::InlineParser::Parser < ::Prism::Visitor
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:81
   def diagnostics; end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:472
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:498
   def insert_declaration(decl); end
 
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:58
   def module_nesting; end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:315
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:341
   def parse_attribute_call(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:375
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:401
   def parse_constant_declaration(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:259
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:285
   def parse_mixin_call(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:508
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:534
   def parse_super_class(super_class_expr, inheritance_operator_loc); end
 
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:85
   def push_module_nesting(mod); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:480
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:506
   def report_unused_annotation(*annotations); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:495
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:521
   def report_unused_block(block); end
 
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:58
@@ -4028,22 +4102,25 @@ class RBS::InlineParser::Parser < ::Prism::Visitor
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:92
   def skip_node?(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:217
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:243
   def visit_call_node(node); end
 
   # pkg:gem/rbs#lib/rbs/inline_parser.rb:103
   def visit_class_node(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:253
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:167
+  def visit_class_or_module_body(decl, node); end
+
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:279
   def visit_constant_path_write_node(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:246
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:272
   def visit_constant_write_node(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:178
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:202
   def visit_def_node(node); end
 
-  # pkg:gem/rbs#lib/rbs/inline_parser.rb:156
+  # pkg:gem/rbs#lib/rbs/inline_parser.rb:125
   def visit_module_node(node); end
 end
 
@@ -4146,36 +4223,26 @@ end
 # pkg:gem/rbs#lib/rbs/errors.rb:20
 class RBS::LoadingError < ::RBS::BaseError; end
 
-# pkg:gem/rbs#lib/rbs.rb:71
+# Pure-Ruby implementation of the primitives that back RBS::Location.
+#
+# On CRuby these come from the C extension (ext/rbs_extension/legacy_location.c).
+# JRuby loads this instead, before rbs/location_aux.rb layers the public API on
+# top, so RBS::Location behaves identically without the native extension.
+#
+# pkg:gem/rbs#lib/rbs/location_aux.rb:4
 class RBS::Location
-  # pkg:gem/rbs#lib/rbs.rb:71
   def initialize(_arg0, _arg1, _arg2); end
 
   # pkg:gem/rbs#lib/rbs/location_aux.rb:79
   def ==(other); end
 
-  # pkg:gem/rbs#lib/rbs.rb:71
   def [](_arg0); end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _add_optional_child(_arg0, _arg1, _arg2); end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _add_optional_no_child(_arg0); end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _add_required_child(_arg0, _arg1, _arg2); end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _end_pos; end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _optional_keys; end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _required_keys; end
-
-  # pkg:gem/rbs#lib/rbs.rb:71
   def _start_pos; end
 
   # pkg:gem/rbs#lib/rbs/location_aux.rb:110
@@ -4187,7 +4254,6 @@ class RBS::Location
   # pkg:gem/rbs#lib/rbs/location_aux.rb:27
   def aref(_arg0); end
 
-  # pkg:gem/rbs#lib/rbs.rb:71
   def buffer; end
 
   # pkg:gem/rbs#lib/rbs/location_aux.rb:118
@@ -4255,7 +4321,6 @@ class RBS::Location
 
   private
 
-  # pkg:gem/rbs#lib/rbs.rb:71
   def initialize_copy(_arg0); end
 
   class << self
@@ -4413,66 +4478,77 @@ class RBS::Namespace
   # pkg:gem/rbs#lib/rbs/namespace.rb:7
   def initialize(path:, absolute:); end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:20
+  # pkg:gem/rbs#lib/rbs/namespace.rb:55
   def +(other); end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:59
+  # pkg:gem/rbs#lib/rbs/namespace.rb:94
   def ==(other); end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:47
+  # pkg:gem/rbs#lib/rbs/namespace.rb:82
   def absolute!; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:39
+  # pkg:gem/rbs#lib/rbs/namespace.rb:74
   def absolute?; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:28
+  # pkg:gem/rbs#lib/rbs/namespace.rb:63
   def append(component); end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:101
+  # pkg:gem/rbs#lib/rbs/namespace.rb:137
   def ascend; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:55
+  # pkg:gem/rbs#lib/rbs/namespace.rb:90
   def empty?; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:63
+  # pkg:gem/rbs#lib/rbs/namespace.rb:99
   def eql?(other); end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:65
+  # pkg:gem/rbs#lib/rbs/namespace.rb:101
   def hash; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:32
+  # pkg:gem/rbs#lib/rbs/namespace.rb:67
   def parent; end
 
   # pkg:gem/rbs#lib/rbs/namespace.rb:5
   def path; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:51
+  # pkg:gem/rbs#lib/rbs/namespace.rb:86
   def relative!; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:43
+  # pkg:gem/rbs#lib/rbs/namespace.rb:78
   def relative?; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:69
+  # pkg:gem/rbs#lib/rbs/namespace.rb:105
   def split; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:75
+  # pkg:gem/rbs#lib/rbs/namespace.rb:111
   def to_s; end
 
-  # pkg:gem/rbs#lib/rbs/namespace.rb:84
+  # pkg:gem/rbs#lib/rbs/namespace.rb:120
   def to_type_name; end
 
   class << self
-    # pkg:gem/rbs#lib/rbs/namespace.rb:12
+    # Returns a canonical `Namespace` instance for the given `path` /
+    # `absolute` pair. Repeated calls with structurally equal arguments
+    # return the same object, so callers can rely on `equal?` for fast
+    # equality. The path Array is duplicated and frozen on insert.
+    #
+    # pkg:gem/rbs#lib/rbs/namespace.rb:24
+    def [](path, absolute); end
+
+    # pkg:gem/rbs#lib/rbs/namespace.rb:47
     def empty; end
 
-    # pkg:gem/rbs#lib/rbs/namespace.rb:93
+    # pkg:gem/rbs#lib/rbs/namespace.rb:129
     def parse(string); end
 
-    # pkg:gem/rbs#lib/rbs/namespace.rb:16
+    # pkg:gem/rbs#lib/rbs/namespace.rb:51
     def root; end
   end
 end
 
+# pkg:gem/rbs#lib/rbs/namespace.rb:18
+module RBS::Namespace::INTERN_LEAF; end
+
 # pkg:gem/rbs#lib/rbs/errors.rb:229
 class RBS::NoMixinFoundError < ::RBS::DefinitionError
   include ::RBS::DetailedMessageable
@@ -4564,34 +4640,31 @@ class RBS::NonregularTypeAliasError < ::RBS::BaseError
   def location; end
 end
 
-# pkg:gem/rbs#lib/rbs.rb:71
+# WebAssembly-backed implementation of the parser primitives.
+#
+# On CRuby these come from the C extension (ext/rbs_extension/main.c). JRuby
+# loads this instead: it runs the parser inside WebAssembly, then rebuilds the
+# AST with RBS::WASM::Deserializer. rbs/parser_aux.rb layers the public
+# RBS::Parser API on top, exactly as it does for the C extension.
+#
+# pkg:gem/rbs#lib/rbs/parser/lex_result.rb:4
 class RBS::Parser
   class << self
-    # pkg:gem/rbs#lib/rbs.rb:71
     def _lex(_arg0, _arg1); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
     def _parse_inline_leading_annotation(_arg0, _arg1, _arg2, _arg3); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
     def _parse_inline_trailing_annotation(_arg0, _arg1, _arg2, _arg3); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
     def _parse_method_type(_arg0, _arg1, _arg2, _arg3, _arg4); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
+    def _parse_method_type_to_bytes(_arg0, _arg1, _arg2, _arg3, _arg4); end
     def _parse_signature(_arg0, _arg1, _arg2); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
+    def _parse_signature_to_bytes(_arg0, _arg1, _arg2); end
     def _parse_type(_arg0, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6, _arg7); end
-
-    # pkg:gem/rbs#lib/rbs.rb:71
     def _parse_type_params(_arg0, _arg1, _arg2, _arg3); end
+    def _parse_type_to_bytes(_arg0, _arg1, _arg2, _arg3, _arg4, _arg5, _arg6, _arg7); end
 
     # pkg:gem/rbs#lib/rbs/parser_aux.rb:79
     def buffer(source); end
 
-    # pkg:gem/rbs#lib/rbs/parser_aux.rb:132
+    # pkg:gem/rbs#lib/rbs/parser_aux.rb:134
     def byte_range(char_range, content); end
 
     # pkg:gem/rbs#lib/rbs/parser_aux.rb:70
@@ -4603,7 +4676,7 @@ class RBS::Parser
     # pkg:gem/rbs#lib/rbs/parser_aux.rb:122
     def parse_inline_leading_annotation(source, range, variables: T.unsafe(nil)); end
 
-    # pkg:gem/rbs#lib/rbs/parser_aux.rb:127
+    # pkg:gem/rbs#lib/rbs/parser_aux.rb:128
     def parse_inline_trailing_annotation(source, range, variables: T.unsafe(nil)); end
 
     # pkg:gem/rbs#lib/rbs/parser_aux.rb:14
@@ -4839,82 +4912,122 @@ end
 class RBS::Prototype::RBI
   include ::RBS::Prototype::Helpers
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:12
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:22
   def initialize; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:545
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:35
+  def append_decl(decl); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:394
+  def attribute_type(kind, sigs); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:713
   def call_node?(node, name:, receiver: T.unsafe(nil), args: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:549
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:717
   def const_to_name(node); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:71
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:95
+  def current_context; end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:99
+  def current_context!; end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:87
   def current_module; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:75
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:91
   def current_module!; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:27
-  def current_namespace; end
-
   # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:8
   def decls; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:585
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:753
   def each_arg(array, &block); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:599
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:767
   def each_child(node); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:93
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:150
   def join_comments(nodes, comments); end
 
   # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:10
   def last_sig; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:262
+  # Visibility of a member, given as `private def ...` in RBS
+  #
+  # Returns `nil` for members in a visibility _section_, which `sync_visibility` emits instead.
+  #
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:106
+  def member_visibility(context); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:423
   def method_type(args_node, type_node, variables:, overloads:); end
 
   # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:9
   def modules; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:23
-  def nested_name(name); end
-
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:607
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:775
   def node_to_hash(node); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:18
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:30
   def parse(string); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:335
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:496
   def parse_params(args_node, args, method_type, variables:, overloads:); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:87
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:144
   def pop_sig; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:537
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:705
   def proc_type?(type_node); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:98
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:155
   def process(node, comments:, outer: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:33
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:359
+  def process_attribute(node, comments:); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:336
+  def process_visibility(node, outer:, comments:); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:43
   def push_class(name, super_class, comment:); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:52
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:65
   def push_module(name, comment:); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:79
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:136
   def push_sig(node); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:460
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:113
+  def sync_visibility(visibility); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:621
   def type_of(type_node, variables:); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:473
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:636
   def type_of0(type_node, variables:); end
 end
 
+# pkg:gem/rbs#lib/rbs/prototype/rbi.rb:12
+class RBS::Prototype::RBI::Context
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:16
+  def initialize(singleton:, visibility:); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:13
+  def singleton; end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:13
+  def singleton=(_arg0); end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:14
+  def visibility; end
+
+  # pkg:gem/rbs#lib/rbs/prototype/rbi.rb:14
+  def visibility=(_arg0); end
+end
+
 # pkg:gem/rbs#lib/rbs/prototype/runtime/helpers.rb:5
 class RBS::Prototype::Runtime
   include ::RBS::Prototype::Helpers
@@ -4923,50 +5036,50 @@ class RBS::Prototype::Runtime
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:79
   def initialize(patterns:, env:, merge:, todo: T.unsafe(nil), owners_included: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:662
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:664
   def block_from_ast_of(method); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:109
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:111
   def builder; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:117
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:119
   def decls; end
 
   # Generate/find outer module declarations
   # This is broken down into another method to comply with `DRY`
   # This generates/finds declarations in nested form & returns the last array of declarations
   #
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:591
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:593
   def ensure_outer_module_declarations(mod); end
 
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:73
   def env; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:496
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:498
   def generate_class(mod); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:433
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:435
   def generate_constants(mod, decls); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:309
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:311
   def generate_methods(mod, module_name, members); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:573
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:575
   def generate_mixin(mod, decl, type_name, type_name_absolute); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:535
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:537
   def generate_module(mod); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:481
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:483
   def generate_super_class(mod); end
 
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:74
   def merge; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:248
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:250
   def merge_rbs(module_name, members, instance: T.unsafe(nil), singleton: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:179
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:181
   def method_type(method); end
 
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:77
@@ -4978,39 +5091,39 @@ class RBS::Prototype::Runtime
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:76
   def owners_included; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:113
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:115
   def parse(file); end
 
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:72
   def patterns; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:92
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:94
   def target?(const); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:296
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:298
   def target_method?(mod, instance: T.unsafe(nil), singleton: T.unsafe(nil)); end
 
   # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:75
   def todo; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:105
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:107
   def todo_object; end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:645
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:647
   def type_args(type_name); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:653
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:655
   def type_params(mod); end
 
   private
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:423
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:425
   def can_alias?(mod, method); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:137
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:139
   def each_mixined_module(type_name, mod); end
 
-  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:146
+  # pkg:gem/rbs#lib/rbs/prototype/runtime.rb:148
   def each_mixined_module_one(type_name, mod); end
 end
 
@@ -5166,31 +5279,31 @@ class RBS::RDocPlugin::Parser
   # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:9
   def content=(_arg0); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:94
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:99
   def parse_attr_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:53
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:58
   def parse_class_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:67
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:72
   def parse_constant_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:125
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:130
   def parse_extend_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:109
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:114
   def parse_include_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:24
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:29
   def parse_member(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:88
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:93
   def parse_method_alias_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:73
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:78
   def parse_method_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:60
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:65
   def parse_module_decl(decl:, context:, outer_name: T.unsafe(nil)); end
 
   # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:16
@@ -5204,13 +5317,13 @@ class RBS::RDocPlugin::Parser
 
   private
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:149
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:154
   def comment_string(with_comment); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:143
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:148
   def construct_comment(context:, comment:); end
 
-  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:154
+  # pkg:gem/rbs#lib/rdoc_plugin/parser.rb:159
   def fully_qualified_name(outer_name:, decl:); end
 end
 
@@ -5448,7 +5561,7 @@ class RBS::Resolver::TypeNameResolver
   # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:10
   def initialize(all_names, aliases); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:82
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:80
   def aliased_name?(type_name); end
 
   # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:8
@@ -5460,29 +5573,29 @@ class RBS::Resolver::TypeNameResolver
   # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:7
   def cache; end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:76
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:74
   def has_type_name?(full_name); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:121
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:119
   def normalize_namespace(type_name, rhs, context, visited); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:39
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:37
   def resolve(type_name, context:); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:104
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:102
   def resolve_head_namespace(head, context); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:62
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:60
   def resolve_namespace(type_name, context:); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:136
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:134
   def resolve_namespace0(type_name, context, visited); end
 
-  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:88
+  # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:86
   def resolve_type_name(type_name, context); end
 
   # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:32
-  def try_cache(query); end
+  def try_cache(type_name, context); end
 
   class << self
     # pkg:gem/rbs#lib/rbs/resolver/type_name_resolver.rb:16
@@ -5490,6 +5603,35 @@ class RBS::Resolver::TypeNameResolver
   end
 end
 
+# pkg:gem/rbs#lib/rbs/rewriter.rb:4
+class RBS::Rewriter
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:7
+  def initialize(buffer); end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:25
+  def add_comment(*locations, content:); end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:5
+  def buffer; end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:43
+  def delete_comment(comment); end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:36
+  def replace_comment(comment, content:); end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:14
+  def rewrite(location, string); end
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:51
+  def string; end
+
+  private
+
+  # pkg:gem/rbs#lib/rbs/rewriter.rb:63
+  def format_comment(content, indent); end
+end
+
 # pkg:gem/rbs#lib/rbs/source.rb:4
 module RBS::Source; end
 
@@ -5743,31 +5885,31 @@ class RBS::TypeName
   # pkg:gem/rbs#lib/rbs/type_name.rb:9
   def initialize(namespace:, name:); end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:79
+  # pkg:gem/rbs#lib/rbs/type_name.rb:105
   def +(other); end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:25
+  # pkg:gem/rbs#lib/rbs/type_name.rb:50
   def ==(other); end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:55
+  # pkg:gem/rbs#lib/rbs/type_name.rb:81
   def absolute!; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:59
+  # pkg:gem/rbs#lib/rbs/type_name.rb:85
   def absolute?; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:51
+  # pkg:gem/rbs#lib/rbs/type_name.rb:77
   def alias?; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:47
+  # pkg:gem/rbs#lib/rbs/type_name.rb:73
   def class?; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:29
+  # pkg:gem/rbs#lib/rbs/type_name.rb:55
   def eql?(other); end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:31
+  # pkg:gem/rbs#lib/rbs/type_name.rb:57
   def hash; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:67
+  # pkg:gem/rbs#lib/rbs/type_name.rb:93
   def interface?; end
 
   # pkg:gem/rbs#lib/rbs/type_name.rb:7
@@ -5779,26 +5921,34 @@ class RBS::TypeName
   # pkg:gem/rbs#lib/rbs/type_name.rb:5
   def namespace; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:63
+  # pkg:gem/rbs#lib/rbs/type_name.rb:89
   def relative!; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:75
+  # pkg:gem/rbs#lib/rbs/type_name.rb:101
   def split; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:39
+  # pkg:gem/rbs#lib/rbs/type_name.rb:65
   def to_json(state = T.unsafe(nil)); end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:43
+  # pkg:gem/rbs#lib/rbs/type_name.rb:69
   def to_namespace; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:35
+  # pkg:gem/rbs#lib/rbs/type_name.rb:61
   def to_s; end
 
-  # pkg:gem/rbs#lib/rbs/type_name.rb:71
+  # pkg:gem/rbs#lib/rbs/type_name.rb:97
   def with_prefix(namespace); end
 
   class << self
-    # pkg:gem/rbs#lib/rbs/type_name.rb:90
+    # Returns a canonical `TypeName` instance for the given `namespace` /
+    # `name` pair. The namespace is canonicalized through `Namespace.[]`
+    # so identity-based lookup works regardless of the caller passing a
+    # fresh `Namespace.new` or an already-interned instance.
+    #
+    # pkg:gem/rbs#lib/rbs/type_name.rb:36
+    def [](namespace, name); end
+
+    # pkg:gem/rbs#lib/rbs/type_name.rb:113
     def parse(string); end
   end
 end
diff --git a/sorbet/rbi/gems/require-hooks@0.4.0.rbi b/sorbet/rbi/gems/require-hooks@0.4.1.rbi
similarity index 100%
rename from sorbet/rbi/gems/require-hooks@0.4.0.rbi
rename to sorbet/rbi/gems/require-hooks@0.4.1.rbi
diff --git a/sorbet/rbi/gems/rubocop-sorbet@0.13.1.rbi b/sorbet/rbi/gems/rubocop-sorbet@0.13.2.rbi
similarity index 98%
rename from sorbet/rbi/gems/rubocop-sorbet@0.13.1.rbi
rename to sorbet/rbi/gems/rubocop-sorbet@0.13.2.rbi
index 7376fb612..eb81a8e1c 100644
--- a/sorbet/rbi/gems/rubocop-sorbet@0.13.1.rbi
+++ b/sorbet/rbi/gems/rubocop-sorbet@0.13.2.rbi
@@ -608,13 +608,13 @@ class RuboCop::Cop::Sorbet::EnforceSignatures < ::RuboCop::Cop::Base
 
   private
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:161
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:190
   def add_accessor_parameter_if_needed(suggest, symbol, method); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:183
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:212
   def allow_rbs?; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:202
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:231
   def autocorrect_style; end
 
   # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:120
@@ -623,37 +623,46 @@ class RuboCop::Cop::Sorbet::EnforceSignatures < ::RuboCop::Cop::Base
   # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:75
   def check_node(node); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:126
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:133
   def create_signature_suggestion(node, type); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:175
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:166
+  def in_sclass_context?(node); end
+
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:162
+  def instance_initialize?(node); end
+
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:127
+  def leftmost_send_ancestor(node); end
+
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:204
   def param_type_placeholder; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:153
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:177
   def populate_accessor_suggestion(suggest, node); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:143
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:150
   def populate_method_definition_suggestion(suggest, node); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:135
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:142
   def populate_signature_suggestion(suggest, node); end
 
   # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:116
   def rbs_checker; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:179
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:208
   def return_type_placeholder; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:167
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:196
   def set_void_return_for_writer(suggest, method); end
 
   # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:112
   def sig_checker; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:187
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:216
   def signature_style; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:171
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:200
   def writer_or_accessor?(method); end
 end
 
@@ -693,110 +702,116 @@ class RuboCop::Cop::Sorbet::EnforceSignatures::Param < ::Struct
   end
 end
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:225
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:254
 class RuboCop::Cop::Sorbet::EnforceSignatures::RBSSignatureChecker < ::RuboCop::Cop::Sorbet::EnforceSignatures::SignatureChecker
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:228
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:257
   def signature_node(node); end
 
   private
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:241
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:270
   def find_non_send_ancestor(node); end
 end
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:226
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:255
 RuboCop::Cop::Sorbet::EnforceSignatures::RBSSignatureChecker::RBS_COMMENT_REGEX = T.let(T.unsafe(nil), Regexp)
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:301
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:330
 class RuboCop::Cop::Sorbet::EnforceSignatures::RBSSuggestion
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:304
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:333
   def initialize(indent); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
+  def attribute; end
+
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
+  def attribute=(_arg0); end
+
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def has_block; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def has_block=(_arg0); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def params; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def params=(_arg0); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def returns; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:302
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:331
   def returns=(_arg0); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:311
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:341
   def to_autocorrect; end
 
   private
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:317
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:347
   def generate_signature; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:333
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:365
   def rbs_param(param); end
 end
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:247
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:276
 class RuboCop::Cop::Sorbet::EnforceSignatures::SigSignatureChecker < ::RuboCop::Cop::Sorbet::EnforceSignatures::SignatureChecker
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:248
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:277
   def initialize(processed_source); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:261
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:290
   def clear_signature(scope); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:257
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:286
   def on_signature(node, scope); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:253
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:282
   def signature_node(scope); end
 end
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:266
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:295
 class RuboCop::Cop::Sorbet::EnforceSignatures::SigSuggestion
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:269
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:298
   def initialize(indent, param_placeholder, return_placeholder); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:267
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:296
   def params; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:267
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:296
   def params=(_arg0); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:267
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:296
   def returns; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:267
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:296
   def returns=(_arg0); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:277
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:306
   def to_autocorrect; end
 
   private
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:283
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:312
   def generate_params; end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:290
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:319
   def generate_return; end
 end
 
-# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:211
+# pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:240
 class RuboCop::Cop::Sorbet::EnforceSignatures::SignatureChecker
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:212
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:241
   def initialize(processed_source); end
 
   protected
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:220
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:249
   def preceding_comments(node); end
 
-  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:218
+  # pkg:gem/rubocop-sorbet#lib/rubocop/cop/sorbet/signatures/enforce_signatures.rb:247
   def processed_source; end
 end
 
diff --git a/sorbet/rbi/gems/rubydex@0.2.9.rbi b/sorbet/rbi/gems/rubydex@0.3.0.rbi
similarity index 89%
rename from sorbet/rbi/gems/rubydex@0.2.9.rbi
rename to sorbet/rbi/gems/rubydex@0.3.0.rbi
index bb50963ef..cb9c86445 100644
--- a/sorbet/rbi/gems/rubydex@0.2.9.rbi
+++ b/sorbet/rbi/gems/rubydex@0.3.0.rbi
@@ -16,16 +16,11 @@ module Rubydex; end
 # pkg:gem/rubydex#lib/rubydex/errors.rb:7
 class Rubydex::AliasCycleError < ::Rubydex::Error; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::AttrAccessorDefinition < ::Rubydex::Definition; end
-
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::AttrReaderDefinition < ::Rubydex::Definition; end
-
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::AttrWriterDefinition < ::Rubydex::Definition; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:30
 class Rubydex::Class < ::Rubydex::Namespace
   include ::Rubydex::Visibility
 
@@ -33,7 +28,6 @@ class Rubydex::Class < ::Rubydex::Namespace
   def visibility; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ClassDefinition < ::Rubydex::Definition
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[Rubydex::Mixin]) }
@@ -44,17 +38,15 @@ class Rubydex::ClassDefinition < ::Rubydex::Definition
   def superclass; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ClassVariable < ::Rubydex::Declaration
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[T.untyped]) }
   def references; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ClassVariableDefinition < ::Rubydex::Definition; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/comment.rb:4
 class Rubydex::Comment
   # pkg:gem/rubydex#lib/rubydex/comment.rb:12
   sig { params(string: String, location: Rubydex::Location).void }
@@ -74,7 +66,7 @@ end
 # pkg:gem/rubydex#lib/rubydex/errors.rb:10
 class Rubydex::ConfigError < ::Rubydex::Error; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:43
 class Rubydex::Constant < ::Rubydex::Declaration
   include ::Rubydex::Visibility
 
@@ -86,7 +78,7 @@ class Rubydex::Constant < ::Rubydex::Declaration
   def visibility; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:47
 class Rubydex::ConstantAlias < ::Rubydex::Declaration
   include ::Rubydex::Visibility
 
@@ -102,19 +94,19 @@ class Rubydex::ConstantAlias < ::Rubydex::Declaration
   def visibility; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ConstantAliasDefinition < ::Rubydex::Definition; end
-
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ConstantDefinition < ::Rubydex::Definition; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ConstantReference < ::Rubydex::Reference
   abstract!
 
   # pkg:gem/rubydex#lib/rubydex.rb:11
   def initialize(_arg0, _arg1); end
 
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  sig { returns(Rubydex::Document) }
+  def document; end
+
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(Rubydex::Location) }
   def location; end
@@ -124,10 +116,9 @@ class Rubydex::ConstantReference < ::Rubydex::Reference
   end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ConstantVisibilityDefinition < ::Rubydex::Definition; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:15
 class Rubydex::Declaration
   abstract!
 
@@ -160,11 +151,10 @@ class Rubydex::Declaration
     private
 
     # pkg:gem/rubydex#lib/rubydex.rb:11
-    def new(*args); end
+    def new(*_arg0); end
   end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::Definition
   abstract!
 
@@ -183,6 +173,10 @@ class Rubydex::Definition
   sig { returns(T::Boolean) }
   def deprecated?; end
 
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  sig { returns(Rubydex::Document) }
+  def document; end
+
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[Rubydex::Definition]) }
   def lexical_nesting; end
@@ -207,11 +201,11 @@ class Rubydex::Definition
     private
 
     # pkg:gem/rubydex#lib/rubydex.rb:11
-    def new(*args); end
+    def new(*_arg0); end
   end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/diagnostic.rb:4
 class Rubydex::Diagnostic
   # pkg:gem/rubydex#lib/rubydex/diagnostic.rb:15
   sig { params(rule: Symbol, message: String, location: Rubydex::Location).void }
@@ -258,7 +252,6 @@ class Rubydex::DisplayLocation < ::Rubydex::Location
   end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::Document
   # pkg:gem/rubydex#lib/rubydex.rb:11
   def initialize(_arg0, _arg1); end
@@ -279,7 +272,7 @@ class Rubydex::Document
     private
 
     # pkg:gem/rubydex#lib/rubydex.rb:11
-    def new(*args); end
+    def new(*_arg0); end
   end
 end
 
@@ -302,28 +295,24 @@ class Rubydex::Failure
   def message; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::GlobalVariable < ::Rubydex::Declaration
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[T.untyped]) }
   def references; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::GlobalVariableAliasDefinition < ::Rubydex::Definition; end
-
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::GlobalVariableDefinition < ::Rubydex::Definition; end
 
 # The global graph representing all declarations and their relationships for the workspace
 #
 # Note: this class is partially defined in C to integrate with the Rust backend
 #
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/graph.rb:7
 class Rubydex::Graph
   # pkg:gem/rubydex#lib/rubydex/graph.rb:11
   sig { params(workspace_path: T.nilable(String)).void }
-  def initialize(workspace_path: T.unsafe(nil)); end
+  def initialize(workspace_path: nil); end
 
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { params(fully_qualified_name: String).returns(T.nilable(Rubydex::Declaration)) }
@@ -403,7 +392,12 @@ class Rubydex::Graph
   def keyword(_arg0); end
 
   # pkg:gem/rubydex#lib/rubydex.rb:11
-  def load_config(*_arg0); end
+  # Loads configuration, merging its exclusion patterns into the graph's configuration (the workspace path is never
+  # overridden). With `config_path` (resolved relative to the workspace path), an explicitly named file that does not
+  # exist raises `Rubydex::ConfigError`. With no argument, the default `.rubydex` is loaded if present and ignored if
+  # missing. Raises `Rubydex::ConfigError` if a file cannot be read or is malformed.
+  sig { params(config_path: T.nilable(String)).void }
+  def load_config(config_path = nil); end
 
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Enumerable[Rubydex::MethodReference]) }
@@ -458,6 +452,12 @@ class Rubydex::Graph
   # pkg:gem/rubydex#lib/rubydex/graph.rb:46
   sig { params(paths: T::Array[String]).void }
   def add_workspace_dependency_paths(paths); end
+
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  def initialize_clone(_arg0); end
+
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  def initialize_copy(_arg0); end
 end
 
 # pkg:gem/rubydex#lib/rubydex/graph.rb:8
@@ -468,20 +468,18 @@ Rubydex::Graph::INDEXABLE_EXTENSIONS = T.let(T.unsafe(nil), Array)
 # pkg:gem/rubydex#lib/rubydex/mixin.rb:15
 class Rubydex::Include < ::Rubydex::Mixin; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::InstanceVariable < ::Rubydex::Declaration
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[T.untyped]) }
   def references; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::InstanceVariableDefinition < ::Rubydex::Definition; end
 
 # pkg:gem/rubydex#lib/rubydex/failures.rb:14
 class Rubydex::IntegrityFailure < ::Rubydex::Failure; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/keyword.rb:4
 class Rubydex::Keyword
   # pkg:gem/rubydex#lib/rubydex/keyword.rb:12
   sig { params(name: String, documentation: String).void }
@@ -496,7 +494,7 @@ class Rubydex::Keyword
   def name; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/keyword_parameter.rb:4
 class Rubydex::KeywordParameter
   # pkg:gem/rubydex#lib/rubydex/keyword_parameter.rb:9
   sig { params(name: String).void }
@@ -510,7 +508,7 @@ end
 # A zero based internal location. Intended to be used for tool-to-tool communication, such as a language server
 # communicating with an editor.
 #
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/location.rb:6
 class Rubydex::Location
   include ::Comparable
 
@@ -570,7 +568,7 @@ end
 # pkg:gem/rubydex#lib/rubydex/location.rb:7
 class Rubydex::Location::NotFileUriError < ::StandardError; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:51
 class Rubydex::Method < ::Rubydex::Declaration
   include ::Rubydex::Visibility
 
@@ -582,7 +580,6 @@ class Rubydex::Method < ::Rubydex::Declaration
   def visibility; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::MethodAliasDefinition < ::Rubydex::Definition
   # pkg:gem/rubydex#lib/rubydex.rb:11
   def signatures; end
@@ -592,17 +589,19 @@ class Rubydex::MethodAliasDefinition < ::Rubydex::Definition
   def target; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::MethodDefinition < ::Rubydex::Definition
   # pkg:gem/rubydex#lib/rubydex.rb:11
   def signatures; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::MethodReference < ::Rubydex::Reference
   # pkg:gem/rubydex#lib/rubydex.rb:11
   def initialize(_arg0, _arg1); end
 
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  sig { returns(Rubydex::Document) }
+  def document; end
+
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(Rubydex::Location) }
   def location; end
@@ -616,7 +615,6 @@ class Rubydex::MethodReference < ::Rubydex::Reference
   def receiver; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::MethodVisibilityDefinition < ::Rubydex::Definition; end
 
 # pkg:gem/rubydex#lib/rubydex/mixin.rb:4
@@ -631,7 +629,7 @@ class Rubydex::Mixin
   def constant_reference; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:34
 class Rubydex::Module < ::Rubydex::Namespace
   include ::Rubydex::Visibility
 
@@ -639,14 +637,13 @@ class Rubydex::Module < ::Rubydex::Namespace
   def visibility; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ModuleDefinition < ::Rubydex::Definition
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[Rubydex::Mixin]) }
   def mixins; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:23
 class Rubydex::Namespace < ::Rubydex::Declaration
   abstract!
 
@@ -687,7 +684,20 @@ end
 # pkg:gem/rubydex#lib/rubydex/mixin.rb:18
 class Rubydex::Prepend < ::Rubydex::Mixin; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+class Rubydex::Query
+  # pkg:gem/rubydex#lib/rubydex.rb:11
+  def render(*_arg0); end
+
+  class << self
+    sig { params(query: String).returns(Rubydex::Query) }
+    def parse(query); end
+
+    sig { params(format: T.any(String, Symbol)).returns(String) }
+    def schema(format = :table); end
+  end
+end
+
+# pkg:gem/rubydex#lib/rubydex/reference.rb:4
 class Rubydex::Reference
   abstract!
 
@@ -701,18 +711,17 @@ class Rubydex::Reference
     private
 
     # pkg:gem/rubydex#lib/rubydex.rb:11
-    def new(*args); end
+    def new(*_arg0); end
   end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::ResolvedConstantReference < ::Rubydex::ConstantReference
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(Rubydex::Declaration) }
   def declaration; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:4
 class Rubydex::Signature
   # pkg:gem/rubydex#lib/rubydex/signature.rb:33
   def initialize(parameters); end
@@ -754,25 +763,25 @@ class Rubydex::Signature
   def rest_positional_parameter; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:27
 class Rubydex::Signature::BlockParameter < ::Rubydex::Signature::Parameter; end
 
 # pkg:gem/rubydex#lib/rubydex/signature.rb:66
 Rubydex::Signature::DECONSTRUCT_KEYS = T.let(T.unsafe(nil), Array)
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:26
 class Rubydex::Signature::ForwardParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:23
 class Rubydex::Signature::KeywordParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:24
 class Rubydex::Signature::OptionalKeywordParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:20
 class Rubydex::Signature::OptionalPositionalParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:5
 class Rubydex::Signature::Parameter
   # pkg:gem/rubydex#lib/rubydex/signature.rb:13
   def initialize(name, location); end
@@ -784,36 +793,33 @@ class Rubydex::Signature::Parameter
   def name; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:19
 class Rubydex::Signature::PositionalParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:22
 class Rubydex::Signature::PostParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:25
 class Rubydex::Signature::RestKeywordParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/signature.rb:21
 class Rubydex::Signature::RestPositionalParameter < ::Rubydex::Signature::Parameter; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
+# pkg:gem/rubydex#lib/rubydex/declaration.rb:38
 class Rubydex::SingletonClass < ::Rubydex::Namespace
   # pkg:gem/rubydex#lib/rubydex/declaration.rb:40
   sig { returns(Rubydex::Declaration) }
   def attached_class; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::SingletonClassDefinition < ::Rubydex::Definition
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(T::Array[Rubydex::Mixin]) }
   def mixins; end
 end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::Todo < ::Rubydex::Namespace; end
 
-# pkg:gem/rubydex#lib/rubydex.rb:11
 class Rubydex::UnresolvedConstantReference < ::Rubydex::ConstantReference
   # pkg:gem/rubydex#lib/rubydex.rb:11
   sig { returns(String) }
diff --git a/sorbet/rbi/gems/spoom@1.7.16.rbi b/sorbet/rbi/gems/spoom@1.8.4.rbi
similarity index 87%
rename from sorbet/rbi/gems/spoom@1.7.16.rbi
rename to sorbet/rbi/gems/spoom@1.8.4.rbi
index 459f92cce..d01bac15a 100644
--- a/sorbet/rbi/gems/spoom@1.7.16.rbi
+++ b/sorbet/rbi/gems/spoom@1.8.4.rbi
@@ -233,23 +233,24 @@ class Spoom::Cli::Srb::Assertions < ::Thor
   def translate(*paths); end
 end
 
-# pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:10
+# pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:12
 class Spoom::Cli::Srb::Bump < ::Thor
   include ::Spoom::Colorize
   include ::Spoom::Cli::Helper
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:49
+  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:51
   sig { params(directory: ::String).void }
   def bump(directory = T.unsafe(nil)); end
 
+  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:205
+  sig { params(context: ::Spoom::Context, files: T::Array[::String], strictness: ::String).returns(::Tempfile) }
+  def create_typed_override_file(context, files, strictness); end
+
   # pkg:gem/spoom#lib/spoom/cli/srb.rb:20
   def help(command = T.unsafe(nil), subcommand = T.unsafe(nil)); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:170
+  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:182
   def print_changes(files, command:, from: T.unsafe(nil), to: T.unsafe(nil), dry: T.unsafe(nil), path: T.unsafe(nil)); end
-
-  # pkg:gem/spoom#lib/spoom/cli/srb/bump.rb:192
-  def undo_changes(files, from_strictness); end
 end
 
 # pkg:gem/spoom#lib/spoom/cli/srb/coverage.rb:10
@@ -390,22 +391,22 @@ class Spoom::Cli::Srb::Sigs < ::Thor
   include ::Spoom::Colorize
   include ::Spoom::Cli::Helper
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:229
+  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:234
   def exec(context, command); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:95
+  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:100
   def export(output_path = T.unsafe(nil)); end
 
   # pkg:gem/spoom#lib/spoom/cli/srb.rb:32
   def help(command = T.unsafe(nil), subcommand = T.unsafe(nil)); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:76
+  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:81
   def strip(*paths); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:204
+  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:209
   def transform_files(files, &block); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:25
+  # pkg:gem/spoom#lib/spoom/cli/srb/sigs.rb:29
   def translate(*paths); end
 end
 
@@ -414,10 +415,10 @@ class Spoom::Cli::Srb::Tc < ::Thor
   include ::Spoom::Colorize
   include ::Spoom::Cli::Helper
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/tc.rb:147
+  # pkg:gem/spoom#lib/spoom/cli/srb/tc.rb:151
   def colorize_message(message); end
 
-  # pkg:gem/spoom#lib/spoom/cli/srb/tc.rb:138
+  # pkg:gem/spoom#lib/spoom/cli/srb/tc.rb:142
   def format_error(error, format); end
 
   # pkg:gem/spoom#lib/spoom/cli/srb.rb:35
@@ -1696,6 +1697,7 @@ class Spoom::Deadcode::ERB < ::Erubi::Engine
   # @override
   #
   # pkg:gem/spoom#lib/spoom/deadcode/erb.rb:91
+  sig { override.params(_: T.untyped).void }
   def add_postamble(_); end
 
   # @override
@@ -1878,8 +1880,17 @@ class Spoom::Deadcode::Plugins::ActiveModel < ::Spoom::Deadcode::Plugins::Base
   # pkg:gem/spoom#lib/spoom/deadcode/plugins/active_model.rb:13
   sig { override.params(send: ::Spoom::Deadcode::Send).void }
   def on_send(send); end
+
+  private
+
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/active_model.rb:68
+  sig { params(hash_node: ::Prism::HashNode, location: ::Spoom::Location).void }
+  def reference_nested_symbol_options(hash_node, location); end
 end
 
+# pkg:gem/spoom#lib/spoom/deadcode/plugins/active_model.rb:51
+Spoom::Deadcode::Plugins::ActiveModel::NESTED_METHOD_REFERENCE_KEYS = T.let(T.unsafe(nil), Array)
+
 # pkg:gem/spoom#lib/spoom/deadcode/plugins/active_record.rb:7
 class Spoom::Deadcode::Plugins::ActiveRecord < ::Spoom::Deadcode::Plugins::Base
   # @override
@@ -2053,57 +2064,58 @@ class Spoom::Deadcode::Plugins::Base
   # class MyPlugin < Spoom::Deadcode::Plugins::Base
   #   def on_send(send)
   #     return unless send.name == "dsl_method"
-  #     return if send.args.empty?
   #
-  #     method_name = send.args.first.slice.delete_prefix(":")
-  #     @index.reference_method(method_name, send.node, send.loc)
+  #     arg = send.args.first
+  #     return unless arg.is_a?(Prism::SymbolNode)
+  #
+  #     @index.reference_method(arg.unescaped, send.node, send.loc)
   #   end
   # end
   # ~~~
   #
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:278
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:279
   sig { params(send: ::Spoom::Deadcode::Send).void }
   def on_send(send); end
 
   private
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:346
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:347
   sig { params(name: ::String).returns(::String) }
   def camelize(name); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:295
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:296
   sig { params(name: T.nilable(::String)).returns(T::Boolean) }
   def ignored_class_name?(name); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:314
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:315
   sig { params(name: ::String).returns(T::Boolean) }
   def ignored_constant_name?(name); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:319
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:320
   sig { params(name: ::String).returns(T::Boolean) }
   def ignored_method_name?(name); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:324
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:325
   sig { params(name: ::String).returns(T::Boolean) }
   def ignored_module_name?(name); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:329
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:330
   sig { params(name: ::String, names_variable: ::Symbol, patterns_variable: ::Symbol).returns(T::Boolean) }
   def ignored_name?(name, names_variable, patterns_variable); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:302
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:303
   sig { params(definition: ::Spoom::Model::Class).returns(T::Boolean) }
   def ignored_subclass?(definition); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:334
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:335
   sig { params(const: ::Symbol).returns(T::Set[::String]) }
   def names(const); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:339
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:340
   sig { params(const: ::Symbol).returns(T::Array[::Regexp]) }
   def patterns(const); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:287
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/base.rb:288
   sig { params(definition: ::Spoom::Model::Namespace, superclass_name: ::String).returns(T::Boolean) }
   def subclass_of?(definition, superclass_name); end
 
@@ -2216,11 +2228,31 @@ end
 class Spoom::Deadcode::Plugins::GraphQL < ::Spoom::Deadcode::Plugins::Base
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:27
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:30
   sig { override.params(send: ::Spoom::Deadcode::Send).void }
   def on_send(send); end
+
+  private
+
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:62
+  sig { params(send: ::Spoom::Deadcode::Send).void }
+  def on_argument(send); end
+
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:73
+  sig { params(send: ::Spoom::Deadcode::Send).void }
+  def on_builds(send); end
+
+  # pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:46
+  sig { params(send: ::Spoom::Deadcode::Send).void }
+  def on_field(send); end
 end
 
+# pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:26
+Spoom::Deadcode::Plugins::GraphQL::ARGUMENT_SYMBOL_OPTION_KEYS = T.let(T.unsafe(nil), Array)
+
+# pkg:gem/spoom#lib/spoom/deadcode/plugins/graphql.rb:25
+Spoom::Deadcode::Plugins::GraphQL::FIELD_SYMBOL_OPTION_KEYS = T.let(T.unsafe(nil), Array)
+
 # pkg:gem/spoom#lib/spoom/deadcode/plugins/minitest.rb:7
 class Spoom::Deadcode::Plugins::Minitest < ::Spoom::Deadcode::Plugins::Base
   # @override
@@ -2365,9 +2397,9 @@ end
 # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:7
 class Spoom::Deadcode::Remover::Error < ::Spoom::Error; end
 
-# pkg:gem/spoom#lib/spoom/deadcode/remover.rb:366
+# pkg:gem/spoom#lib/spoom/deadcode/remover.rb:409
 class Spoom::Deadcode::Remover::NodeContext
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:377
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:420
   sig do
     params(
       source: ::String,
@@ -2378,96 +2410,96 @@ class Spoom::Deadcode::Remover::NodeContext
   end
   def initialize(source, comments, node, nesting); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:491
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:534
   sig { params(node: ::Prism::Node).returns(T::Array[::Prism::Comment]) }
   def attached_comments(node); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:519
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:562
   sig { returns(T.nilable(::Prism::CallNode)) }
   def attached_sig; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:506
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:549
   sig { returns(T::Array[::Prism::Node]) }
   def attached_sigs; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:368
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:411
   sig { returns(T::Hash[::Integer, ::Prism::Comment]) }
   def comments; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:479
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:522
   sig { params(start_line: ::Integer, end_line: ::Integer).returns(T::Array[::Prism::Comment]) }
   def comments_between_lines(start_line, end_line); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:374
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:417
   sig { returns(T::Array[::Prism::Node]) }
   def nesting; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:374
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:417
   def nesting=(_arg0); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:429
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:472
   sig { returns(T.nilable(::Prism::Node)) }
   def next_node; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:418
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:461
   sig { returns(T::Array[::Prism::Node]) }
   def next_nodes; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:371
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:414
   sig { returns(::Prism::Node) }
   def node; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:393
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:436
   sig { returns(::Spoom::Deadcode::Remover::NodeContext) }
   def parent_context; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:385
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:428
   sig { returns(::Prism::Node) }
   def parent_node; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:413
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:456
   sig { returns(T.nilable(::Prism::Node)) }
   def previous_node; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:402
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:445
   sig { returns(T::Array[::Prism::Node]) }
   def previous_nodes; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:434
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:477
   sig { returns(T.nilable(::Spoom::Deadcode::Remover::NodeContext)) }
   def sclass_context; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:467
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:510
   sig { params(node: T.nilable(::Prism::Node)).returns(T::Boolean) }
   def sorbet_extend_sig?(node); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:462
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:505
   sig { params(node: T.nilable(::Prism::Node)).returns(T::Boolean) }
   def sorbet_signature?(node); end
 end
 
-# pkg:gem/spoom#lib/spoom/deadcode/remover.rb:534
+# pkg:gem/spoom#lib/spoom/deadcode/remover.rb:577
 class Spoom::Deadcode::Remover::NodeFinder < ::Spoom::Visitor
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:599
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:642
   sig { params(location: ::Spoom::Location, kind: T.nilable(::Spoom::Deadcode::Definition::Kind)).void }
   def initialize(location, kind); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:593
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:636
   sig { returns(T.nilable(::Prism::Node)) }
   def node; end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:596
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:639
   sig { returns(T::Array[::Prism::Node]) }
   def nodes_nesting; end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:609
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:652
   sig { override.params(node: T.nilable(::Prism::Node)).void }
   def visit(node); end
 
   class << self
-    # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:537
+    # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:580
     sig do
       params(
         source: ::String,
@@ -2477,7 +2509,7 @@ class Spoom::Deadcode::Remover::NodeFinder < ::Spoom::Visitor
     end
     def find(source, location, kind); end
 
-    # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:568
+    # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:611
     sig { params(node: ::Prism::Node, kind: ::Spoom::Deadcode::Definition::Kind).returns(T::Boolean) }
     def node_match_kind?(node, kind); end
   end
@@ -2505,27 +2537,27 @@ class Spoom::Deadcode::Remover::NodeRemover
 
   private
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:151
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:194
   sig { params(context: ::Spoom::Deadcode::Remover::NodeContext).void }
   def delete_attr_accessor(context); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:325
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:368
   sig { params(start_char: ::Integer, end_char: ::Integer).void }
   def delete_chars(start_char, end_char); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:69
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:112
   sig { params(context: ::Spoom::Deadcode::Remover::NodeContext).void }
   def delete_constant_assignment(context); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:318
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:361
   sig { params(start_line: ::Integer, end_line: ::Integer).void }
   def delete_lines(start_line, end_line); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:255
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:298
   sig { params(context: ::Spoom::Deadcode::Remover::NodeContext).void }
   def delete_node_and_comments_and_sigs(context); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:212
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:255
   sig do
     params(
       node: ::Prism::Node,
@@ -2535,11 +2567,25 @@ class Spoom::Deadcode::Remover::NodeRemover
   end
   def insert_accessor(node, send_context, was_removed:); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:330
+  # When a method is defined as the argument of a modifier call (e.g. `private def foo; end` or
+  # `private_class_method def self.foo; end`), the `def` node's parent is the call rather than the
+  # enclosing class or module body, so its sigs and comments are siblings of the call. Return a
+  # context targeting the outermost such call so they are removed together with the method.
+  #
+  # Modifiers are matched structurally rather than from a fixed list, so user-defined ones are
+  # handled too. A call only counts as a modifier when the `def` is its sole argument and it takes
+  # no block and is a standalone statement, so we never remove a call that does more than wrap
+  # the method (e.g. `register(:thing, def foo; end)` or `FOO = register(def foo; end)`).
+  #
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:80
+  sig { params(def_node: ::Prism::DefNode).returns(T.nilable(::Spoom::Deadcode::Remover::NodeContext)) }
+  def modifier_call_context(def_node); end
+
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:373
   sig { params(start_char: ::Integer, end_char: ::Integer, replacement: ::String).void }
   def replace_chars(start_char, end_char, replacement); end
 
-  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:335
+  # pkg:gem/spoom#lib/spoom/deadcode/remover.rb:378
   sig do
     params(
       node: ::Prism::CallNode,
@@ -4182,11 +4228,20 @@ class Spoom::Printer
   def printt; end
 end
 
+# pkg:gem/spoom#lib/spoom/ext/prism_types.rb:5
+module Spoom::PrismTypes; end
+
+Spoom::PrismTypes::AnyScopeNode = T.type_alias { T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode) }
+
 # pkg:gem/spoom#lib/spoom/rbs.rb:5
 module Spoom::RBS; end
 
 # pkg:gem/spoom#lib/spoom/rbs.rb:71
-class Spoom::RBS::Annotation < ::Spoom::RBS::Comment; end
+class Spoom::RBS::Annotation < ::Spoom::RBS::Comment
+  # pkg:gem/spoom#lib/spoom/rbs.rb:73
+  sig { returns(T::Boolean) }
+  def abstract?; end
+end
 
 # pkg:gem/spoom#lib/spoom/rbs.rb:57
 class Spoom::RBS::Comment
@@ -4230,17 +4285,34 @@ class Spoom::RBS::Comments
   def signatures; end
 end
 
-# pkg:gem/spoom#lib/spoom/rbs.rb:75
+# pkg:gem/spoom#lib/spoom/rbs.rb:93
 module Spoom::RBS::ExtractRBSComments
-  # pkg:gem/spoom#lib/spoom/rbs.rb:77
+  # pkg:gem/spoom#lib/spoom/rbs.rb:95
   sig { params(node: ::Prism::Node).returns(::Spoom::RBS::Comments) }
   def node_rbs_comments(node); end
 end
 
-# pkg:gem/spoom#lib/spoom/rbs.rb:72
-class Spoom::RBS::Signature < ::Spoom::RBS::Comment; end
+# pkg:gem/spoom#lib/spoom/rbs.rb:78
+class Spoom::RBS::Signature < ::Spoom::RBS::Comment
+  # pkg:gem/spoom#lib/spoom/rbs.rb:85
+  sig do
+    params(
+      string: ::String,
+      location: ::Prism::Location,
+      continuation_locations: T::Array[::Prism::Location]
+    ).void
+  end
+  def initialize(string, location, continuation_locations: T.unsafe(nil)); end
 
-# pkg:gem/spoom#lib/spoom/rbs.rb:73
+  # Locations of the `#|` continuation comment lines that make up a multiline signature,
+  # in addition to the `#:` line tracked by `location`.
+  #
+  # pkg:gem/spoom#lib/spoom/rbs.rb:82
+  sig { returns(T::Array[::Prism::Location]) }
+  def continuation_locations; end
+end
+
+# pkg:gem/spoom#lib/spoom/rbs.rb:91
 class Spoom::RBS::TypeAlias < ::Spoom::RBS::Comment; end
 
 # pkg:gem/spoom#lib/spoom.rb:8
@@ -4314,7 +4386,7 @@ class Spoom::Sorbet::Config
   # puts config.options_string # "/foo /bar --ignore /baz --allowed-extension .rb"
   # ~~~
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:64
+  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:66
   sig { returns(::String) }
   def options_string; end
 
@@ -4325,28 +4397,34 @@ class Spoom::Sorbet::Config
   # pkg:gem/spoom#lib/spoom/sorbet/config.rb:30
   def paths=(_arg0); end
 
+  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:30
+  def typed_overrides; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:30
+  def typed_overrides=(_arg0); end
+
   private
 
-  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:44
+  # pkg:gem/spoom#lib/spoom/sorbet/config.rb:45
   sig { params(source: ::Spoom::Sorbet::Config).void }
   def initialize_copy(source); end
 
   class << self
-    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:75
+    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:78
     sig { params(sorbet_config_path: ::String).returns(::Spoom::Sorbet::Config) }
     def parse_file(sorbet_config_path); end
 
-    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:80
+    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:83
     sig { params(sorbet_config: ::String).returns(::Spoom::Sorbet::Config) }
     def parse_string(sorbet_config); end
 
     private
 
-    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:146
+    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:157
     sig { params(line: ::String).returns(T::Boolean) }
     def parse_bool_option(line); end
 
-    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:141
+    # pkg:gem/spoom#lib/spoom/sorbet/config.rb:152
     sig { params(line: ::String).returns(::String) }
     def parse_option(line); end
   end
@@ -4388,11 +4466,11 @@ end
 # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:9
 Spoom::Sorbet::Errors::DEFAULT_ERROR_URL_BASE = T.let(T.unsafe(nil), String)
 
-# pkg:gem/spoom#lib/spoom/sorbet/errors.rb:149
+# pkg:gem/spoom#lib/spoom/sorbet/errors.rb:171
 class Spoom::Sorbet::Errors::Error
   include ::Comparable
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:166
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:188
   sig do
     params(
       file: T.nilable(::String),
@@ -4406,79 +4484,110 @@ class Spoom::Sorbet::Errors::Error
 
   # By default errors are sorted by location
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:177
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:199
   sig { params(other: T.untyped).returns(::Integer) }
   def <=>(other); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:156
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:178
   def code; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:153
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:175
   sig { returns(T.nilable(::String)) }
   def file; end
 
   # Other files associated with the error
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:163
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:185
   sig { returns(T::Set[::String]) }
   def files_from_error_sections; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:156
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:178
   sig { returns(T.nilable(::Integer)) }
   def line; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:153
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:175
   def message; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:159
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:181
   sig { returns(T::Array[::String]) }
   def more; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:189
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:211
   sig { returns(::REXML::Element) }
   def to_junit_xml_element; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:184
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:206
   sig { returns(::String) }
   def to_s; end
 end
 
+# pkg:gem/spoom#lib/spoom/sorbet/errors.rb:240
+class Spoom::Sorbet::Errors::ParseResult
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:248
+  sig { params(errors: T::Array[::Spoom::Sorbet::Errors::Error], warnings: T::Array[::String]).void }
+  def initialize(errors, warnings); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:242
+  sig { returns(T::Array[::Spoom::Sorbet::Errors::Error]) }
+  def errors; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:245
+  sig { returns(T::Array[::String]) }
+  def warnings; end
+end
+
 # Parse errors from Sorbet output
 #
 # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:47
 class Spoom::Sorbet::Errors::Parser
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:67
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:74
   sig { params(error_url_base: ::String).void }
   def initialize(error_url_base: T.unsafe(nil)); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:74
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:82
   sig { params(output: ::String).returns(T::Array[::Spoom::Sorbet::Errors::Error]) }
   def parse(output); end
 
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:87
+  sig { params(output: ::String).returns(::Spoom::Sorbet::Errors::ParseResult) }
+  def parse_result(output); end
+
   private
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:138
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:155
   sig { params(line: ::String).void }
   def append_error(line); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:130
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:166
+  sig { params(warning: ::String).void }
+  def append_warning(warning); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:147
   sig { void }
   def close_error; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:97
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:114
   sig { params(error_url_base: ::String).returns(::Regexp) }
   def error_line_match_regexp(error_url_base); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:114
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:131
   sig { params(line: ::String).returns(T.nilable(::Spoom::Sorbet::Errors::Error)) }
   def match_error_line(line); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:123
+  # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:140
   sig { params(error: ::Spoom::Sorbet::Errors::Error).void }
   def open_error(error); end
 
   class << self
-    # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:60
+    # Used when callers need both parsed Sorbet errors and leading stderr warnings.
+    #
+    # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:67
+    sig { params(output: ::String, error_url_base: ::String).returns(::Spoom::Sorbet::Errors::ParseResult) }
+    def parse_result(output, error_url_base: T.unsafe(nil)); end
+
+    # Used when only Sorbet errors are needed and leading stderr warnings can be ignored.
+    #
+    # pkg:gem/spoom#lib/spoom/sorbet/errors.rb:61
     sig { params(output: ::String, error_url_base: ::String).returns(T::Array[::Spoom::Sorbet::Errors::Error]) }
     def parse_string(output, error_url_base: T.unsafe(nil)); end
   end
@@ -4703,7 +4812,7 @@ module Spoom::Sorbet::Translate
     # Converts all the RBS comments in the given Ruby code to `sig` nodes.
     # It also handles type members and class annotations.
     #
-    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:57
+    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:63
     sig do
       params(
         ruby_contents: ::String,
@@ -4717,7 +4826,7 @@ module Spoom::Sorbet::Translate
     # Converts all `T.let` and `T.cast` nodes to RBS comments in the given Ruby code.
     # It also handles type members and class annotations.
     #
-    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:77
+    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:83
     sig do
       params(
         ruby_contents: ::String,
@@ -4734,86 +4843,173 @@ module Spoom::Sorbet::Translate
     # Converts all `sig` nodes to RBS comments in the given Ruby code.
     # It also handles type members and class annotations.
     #
-    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:37
+    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:39
     sig do
       params(
         ruby_contents: ::String,
         file: ::String,
         positional_names: T::Boolean,
+        preserve_multiline_signatures: T::Boolean,
         max_line_length: T.nilable(::Integer),
         translate_generics: T::Boolean,
         translate_helpers: T::Boolean,
         translate_abstract_methods: T::Boolean
       ).returns(::String)
     end
-    def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: T.unsafe(nil), max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
+    def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: T.unsafe(nil), preserve_multiline_signatures: T.unsafe(nil), max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
 
     # Deletes all `sig` nodes from the given Ruby code.
     # It doesn't handle type members and class annotations.
     #
-    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:22
+    # pkg:gem/spoom#lib/spoom/sorbet/translate.rb:23
     sig { params(ruby_contents: ::String, file: ::String).returns(::String) }
     def strip_sorbet_sigs(ruby_contents, file:); end
   end
 end
 
-# pkg:gem/spoom#lib/spoom/sorbet/translate.rb:16
+# pkg:gem/spoom#lib/spoom/sorbet/translate.rb:17
 class Spoom::Sorbet::Translate::Error < ::Spoom::Error; end
 
+# Walks a Prism AST and records the locations of various bits of code
+# whose locations we want to remain constant after a rewriter.
+#
+# pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:144
+class Spoom::Sorbet::Translate::LandmarkFinder < ::Prism::Visitor
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:158
+  sig { void }
+  def initialize; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:146
+  sig { returns(T::Hash[::String, T::Array[::Integer]]) }
+  def landmarks; end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:165
+  sig { override.params(node: ::Prism::ClassNode).void }
+  def visit_class_node(node); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:187
+  sig { override.params(node: ::Prism::DefNode).void }
+  def visit_def_node(node); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:172
+  sig { override.params(node: ::Prism::ModuleNode).void }
+  def visit_module_node(node); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:179
+  sig { override.params(node: ::Prism::SingletonClassNode).void }
+  def visit_singleton_class_node(node); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:199
+  sig { override.params(node: ::Prism::SourceLineNode).void }
+  def visit_source_line_node(node); end
+
+  private
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:207
+  sig { params(landmark_id: ::String, node: ::Prism::Node).void }
+  def record(landmark_id, node); end
+
+  class << self
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:150
+    sig { params(source: ::String).returns(T::Hash[::String, T::Array[::Integer]]) }
+    def find_landmarks_in(source); end
+  end
+end
+
 # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:7
-class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Translate::Translator
+module Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs
+  class << self
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:23
+    sig { params(source: ::String).returns(T::Boolean) }
+    def contains_rbs_syntax?(source); end
+
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:32
+    sig do
+      params(
+        ruby_contents: ::String,
+        file: ::String,
+        max_line_length: T.nilable(::Integer),
+        overloads_strategy: ::Symbol
+      ).returns(::String)
+    end
+    def rewrite_if_needed(ruby_contents, file:, max_line_length: T.unsafe(nil), overloads_strategy: T.unsafe(nil)); end
+  end
+end
+
+# @abstract
+#
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:9
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseRBIFormat
+  abstract!
+end
+
+# @abstract
+#
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:9
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseTranslator < ::Spoom::Sorbet::Translate::Translator
   include ::Spoom::RBS::ExtractRBSComments
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:40
+  abstract!
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:13
   sig do
     params(
       ruby_contents: ::String,
       file: ::String,
-      max_line_length: T.nilable(::Integer),
-      overloads_strategy: ::Symbol
+      options: ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::Options
     ).void
   end
-  def initialize(ruby_contents, file:, max_line_length: T.unsafe(nil), overloads_strategy: T.unsafe(nil)); end
+  def initialize(ruby_contents, file:, options: T.unsafe(nil)); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:94
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:74
   sig { override.params(node: ::Prism::CallNode).void }
   def visit_call_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:64
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:44
   sig { override.params(node: ::Prism::ClassNode).void }
   def visit_class_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:88
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:68
   sig { override.params(node: ::Prism::DefNode).void }
   def visit_def_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:72
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:52
   sig { override.params(node: ::Prism::ModuleNode).void }
   def visit_module_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:54
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:34
   sig { override.params(node: ::Prism::ProgramNode).void }
   def visit_program_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:80
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:60
   sig { override.params(node: ::Prism::SingletonClassNode).void }
   def visit_singleton_class_node(node); end
 
   private
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:352
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:386
   sig do
     params(
       node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
@@ -4822,15 +5018,36 @@ class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Trans
   end
   def already_extends?(node, constant_regex); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:227
+  # @param is_known: true if this is an RBS annotation that we recognize
+  #                  false for some other `@`-prefixed thing, like a documentation `@param` tag.
+  # @abstract
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:320
+  sig do
+    abstract
+      .params(
+        annotation: ::Spoom::RBS::Annotation,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer,
+        sorbet_replacement: T.nilable(::String)
+      ).void
+  end
+  def apply_class_annotation(annotation, parent_node:, insert_pos:, sorbet_replacement:); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:220
   sig { params(node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode)).void }
   def apply_class_annotations(node); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:328
-  sig { params(annotations: T::Array[::Spoom::RBS::Annotation], sig: ::RBI::Sig).void }
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:333
+  sig do
+    params(
+      annotations: T::Array[::Spoom::RBS::Annotation],
+      sig: ::RBI::Sig
+    ).returns(T::Array[::Spoom::RBS::Annotation])
+  end
   def apply_member_annotations(annotations, sig); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:204
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:197
   sig do
     params(
       signatures: T::Array[::Spoom::RBS::Signature],
@@ -4840,48 +5057,259 @@ class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs < ::Spoom::Sorbet::Trans
   end
   def apply_overloads_strategy(signatures, method_name:, location:); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:404
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:438
   sig { params(comments: T::Array[::Prism::Comment]).void }
   def apply_type_aliases(comments); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:368
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:402
   sig { params(comments: T::Array[::Prism::Comment]).returns(T::Array[::Spoom::RBS::TypeAlias]) }
   def collect_type_aliases(comments); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:156
+  # @abstract
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:383
+  sig do
+    abstract
+      .params(
+        mixin_name: ::String,
+        into: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        at: ::Integer
+      ).void
+  end
+  def extend_with(mixin_name, into:, at:); end
+
+  # Inserts a single `type_member` declaration into the class/module body.
+  # @abstract
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:330
+  sig do
+    abstract
+      .params(
+        type_member: ::String,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer
+      ).void
+  end
+  def insert_type_member(type_member, parent_node:, insert_pos:); end
+
+  # @overridable
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:476
+  sig { overridable.params(of: ::String, to_height_of: ::Spoom::RBS::Comment).returns(::String) }
+  def pad_out_line_count(of:, to_height_of:); end
+
+  # @param is_known: true if this is an RBS annotation that we recognize
+  #                  false for some other `@`-prefixed thing, like a documentation `@param` tag.
+  # @overridable
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:379
+  sig { overridable.params(annotation: ::Spoom::RBS::Annotation, is_known: T::Boolean).void }
+  def rewrite_annotation(annotation, is_known:); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:142
   sig { params(def_node: ::Prism::DefNode, comments: ::Spoom::RBS::Comments).void }
   def rewrite_def(def_node, comments); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:112
+  # Called for every overloaded method sig that we discard because it wasn't the last one.
+  # @abstract
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:217
+  sig { abstract.params(signature: ::Spoom::RBS::Signature).void }
+  def rewrite_discarded_overload(signature); end
+
+  # Rewrites the member annotation comments in the source. Called once per method,
+  # regardless of how many overloaded signatures share the annotations, to avoid
+  # emitting duplicate markers.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:369
+  sig { params(annotations: T::Array[::Spoom::RBS::Annotation], known: T::Array[::Spoom::RBS::Annotation]).void }
+  def rewrite_member_annotations(annotations, known:); end
+
+  # Rewrites the `#: [...]` type params comment (e.g. delete it, or mark it as translated).
+  # @abstract
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:325
+  sig { abstract.params(signature: ::Spoom::RBS::Signature, type_params: T::Array[::RBS::AST::TypeParam]).void }
+  def rewrite_type_params_signature(signature, type_params:); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/base_translator.rb:92
   sig { params(node: ::Prism::CallNode).void }
   def visit_attr(node); end
+end
+
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:12
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::HumanReadableRBIFormat < ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseRBIFormat
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:19
+  sig { params(max_line_length: T.nilable(::Integer)).void }
+  def initialize(max_line_length: T.unsafe(nil)); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:14
+  sig { returns(T.nilable(::Integer)) }
+  def max_line_length; end
 
   class << self
-    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:27
-    sig { params(source: ::String).returns(T::Boolean) }
-    def contains_rbs_syntax?(source); end
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:29
+    sig { returns(::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::HumanReadableRBIFormat) }
+    def default; end
+  end
+end
 
-    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:32
-    sig do
-      params(
-        ruby_contents: ::String,
-        file: ::String,
-        max_line_length: T.nilable(::Integer),
-        overloads_strategy: ::Symbol
-      ).returns(::String)
-    end
-    def rewrite_if_needed(ruby_contents, file:, max_line_length: T.unsafe(nil), overloads_strategy: T.unsafe(nil)); end
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:11
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::HumanReadableTranslator < ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseTranslator
+  private
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:30
+  sig do
+    override
+      .params(
+        annotation: ::Spoom::RBS::Annotation,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer,
+        sorbet_replacement: T.nilable(::String)
+      ).void
+  end
+  def apply_class_annotation(annotation, parent_node:, insert_pos:, sorbet_replacement:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:61
+  sig { override.params(mixin_name: ::String, into: ::Prism::Node, at: ::Integer).void }
+  def extend_with(mixin_name, into:, at:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:53
+  sig do
+    override
+      .params(
+        type_member: ::String,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer
+      ).void
   end
+  def insert_type_member(type_member, parent_node:, insert_pos:); end
+
+  # Deletes the discarded overload from the source codes
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:17
+  sig { override.params(signature: ::Spoom::RBS::Signature).void }
+  def rewrite_discarded_overload(signature); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/human_readable_translator.rb:45
+  sig { override.params(signature: ::Spoom::RBS::Signature, type_params: T::Array[::RBS::AST::TypeParam]).void }
+  def rewrite_type_params_signature(signature, type_params:); end
 end
 
-# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:23
-Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::ALLOWED_OVERLOAD_STRATEGIES = T.let(T.unsafe(nil), Array)
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:33
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::LineMatchedRBIFormat < ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseRBIFormat
+  class << self
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:37
+    sig { returns(::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::LineMatchedRBIFormat) }
+    def default; end
+  end
+end
 
-# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:10
-Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::RBS_ANNOTATION_MARKERS = T.let(T.unsafe(nil), Array)
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:11
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::LineMatchingTranslator < ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseTranslator
+  private
 
-# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb:20
-Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::RBS_REWRITE_PATTERN = T.let(T.unsafe(nil), Regexp)
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:32
+  sig do
+    override
+      .params(
+        annotation: ::Spoom::RBS::Annotation,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer,
+        sorbet_replacement: T.nilable(::String)
+      ).void
+  end
+  def apply_class_annotation(annotation, parent_node:, insert_pos:, sorbet_replacement:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:85
+  sig { override.params(mixin_name: ::String, into: ::Prism::Node, at: ::Integer).void }
+  def extend_with(mixin_name, into:, at:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:71
+  sig do
+    override
+      .params(
+        type_member: ::String,
+        parent_node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
+        insert_pos: ::Integer
+      ).void
+  end
+  def insert_type_member(type_member, parent_node:, insert_pos:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:93
+  sig { override.params(of: ::String, to_height_of: ::Spoom::RBS::Comment).returns(::String) }
+  def pad_out_line_count(of:, to_height_of:); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:77
+  sig { override.params(annotation: ::Spoom::RBS::Annotation, is_known: T::Boolean).void }
+  def rewrite_annotation(annotation, is_known:); end
+
+  # Comments out the discarded overload
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:17
+  sig { override.params(signature: ::Spoom::RBS::Signature).void }
+  def rewrite_discarded_overload(signature); end
+
+  # @override
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/line_matching_translator.rb:51
+  sig { override.params(signature: ::Spoom::RBS::Signature, type_params: T::Array[::RBS::AST::TypeParam]).void }
+  def rewrite_type_params_signature(signature, type_params:); end
+end
+
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:41
+class Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::Options
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:58
+  sig do
+    params(
+      overloads_strategy: ::Symbol,
+      output_format: ::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseRBIFormat,
+      translate_abstract_methods: T::Boolean
+    ).void
+  end
+  def initialize(overloads_strategy: T.unsafe(nil), output_format: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:48
+  sig { returns(::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::BaseRBIFormat) }
+  def output_format; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:43
+  sig { returns(::Symbol) }
+  def overloads_strategy; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:51
+  sig { returns(T::Boolean) }
+  def translate_abstract_methods; end
+
+  class << self
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:78
+    sig { returns(::Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::Options) }
+    def default; end
+  end
+end
+
+# pkg:gem/spoom#lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs/options.rb:45
+Spoom::Sorbet::Translate::RBSCommentsToSorbetSigs::Options::ALLOWED_OVERLOAD_STRATEGIES = T.let(T.unsafe(nil), Array)
 
 # Translates Sorbet assertions to RBS comments.
 #
@@ -4915,44 +5343,56 @@ class Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments < ::Spoom::Sorbet:
 
   private
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:176
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:178
   sig { params(node: ::Prism::Node).returns(T::Boolean) }
   def at_end_of_line?(node); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:118
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:120
   sig { params(call: ::Prism::CallNode).returns(::String) }
   def build_rbs_annotation(call); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:216
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:265
   sig { params(assign: ::Prism::Node, value: ::Prism::Node).returns(::String) }
   def dedent_value(assign, value); end
 
   # Extract any trailing comment after the node
   # Returns [comment_text, comment_end_offset] or [nil, nil] if no comment or RBS annotation
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:196
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:198
   sig { params(node: ::Prism::Node).returns([T.nilable(::String), T.nilable(::Integer)]) }
   def extract_trailing_comment(node); end
 
   # Check if the node has an RBS annotation comment (#:) after it
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:185
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:187
   sig { params(node: ::Prism::Node).returns(T::Boolean) }
   def has_rbs_annotation?(node); end
 
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:218
+  sig { params(node: ::Prism::Node, replace_end_offset: ::Integer).returns(T.nilable(::String)) }
+  def heredoc_body_within_range(node, replace_end_offset); end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:232
+  sig { params(node: ::Prism::Node).returns(T::Array[::Integer]) }
+  def heredoc_end_offsets(node); end
+
   # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:71
   sig { params(node: ::Prism::Node).returns(T::Boolean) }
   def maybe_translate_assertion(node); end
 
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:254
+  sig { params(node: ::Prism::Node).returns(T::Boolean) }
+  def string_literal?(node); end
+
   # Is this node a `T` or `::T` constant?
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:143
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:145
   sig { params(node: T.nilable(::Prism::Node)).returns(T::Boolean) }
   def t?(node); end
 
   # Is this node a `T.let` or `T.cast`?
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:156
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_assertions_to_rbs_comments.rb:158
   sig { params(node: ::Prism::CallNode).returns(T::Boolean) }
   def translatable_annotation?(node); end
 end
@@ -4965,59 +5405,60 @@ Spoom::Sorbet::Translate::SorbetAssertionsToRBSComments::LINE_BREAK = T.let(T.un
 #
 # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:9
 class Spoom::Sorbet::Translate::SorbetSigsToRBSComments < ::Spoom::Sorbet::Translate::Translator
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:19
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:20
   sig do
     params(
       ruby_contents: ::String,
       file: ::String,
       positional_names: T::Boolean,
+      preserve_multiline_signatures: T::Boolean,
       max_line_length: T.nilable(::Integer),
       translate_generics: T::Boolean,
       translate_helpers: T::Boolean,
       translate_abstract_methods: T::Boolean
     ).void
   end
-  def initialize(ruby_contents, file:, positional_names:, max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
+  def initialize(ruby_contents, file:, positional_names:, preserve_multiline_signatures: T.unsafe(nil), max_line_length: T.unsafe(nil), translate_generics: T.unsafe(nil), translate_helpers: T.unsafe(nil), translate_abstract_methods: T.unsafe(nil)); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:100
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:109
   sig { override.params(node: ::Prism::CallNode).void }
   def visit_call_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:46
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:50
   sig { override.params(node: ::Prism::ClassNode).void }
   def visit_class_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:119
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:128
   sig { override.params(node: ::Prism::ConstantWriteNode).void }
   def visit_constant_write_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:64
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:68
   sig { override.params(node: ::Prism::DefNode).void }
   def visit_def_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:52
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:56
   sig { override.params(node: ::Prism::ModuleNode).void }
   def visit_module_node(node); end
 
   # @override
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:58
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:62
   sig { override.params(node: ::Prism::SingletonClassNode).void }
   def visit_singleton_class_node(node); end
 
   private
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:233
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:242
   sig do
     params(
       parent: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
@@ -5026,41 +5467,47 @@ class Spoom::Sorbet::Translate::SorbetSigsToRBSComments < ::Spoom::Sorbet::Trans
   end
   def apply_class_annotation(parent, node); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:277
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:286
   sig { params(sigs: T::Array[[::Prism::CallNode, ::RBI::Sig]]).void }
   def apply_member_annotations(sigs); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:313
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:322
   sig { params(node: ::Prism::ConstantWriteNode).returns(::String) }
   def build_type_member_string(node); end
 
   # Collects the last signatures visited and clears the current list
   #
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:384
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:393
   sig { returns(T::Array[[::Prism::CallNode, ::RBI::Sig]]) }
   def collect_last_sigs; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:371
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:380
   sig { void }
   def delete_extend_t_generics; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:359
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:368
   sig { void }
   def delete_extend_t_helpers; end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:391
-  sig { params(indent: ::Integer, block: T.proc.params(arg0: ::RBI::RBSPrinter).void).returns(::String) }
-  def rbs_print(indent, &block); end
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:400
+  sig do
+    params(
+      indent: ::Integer,
+      preserve_multiline_signatures: T::Boolean,
+      block: T.proc.params(arg0: ::RBI::RBSPrinter).void
+    ).returns(::String)
+  end
+  def rbs_print(indent, preserve_multiline_signatures:, &block); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:191
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:200
   sig { params(node: ::Prism::CallNode).void }
   def visit_attr(node); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:215
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:224
   sig { params(node: ::Prism::CallNode).void }
   def visit_extend(node); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:138
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:147
   sig do
     params(
       node: T.any(::Prism::ClassNode, ::Prism::ModuleNode, ::Prism::SingletonClassNode),
@@ -5069,7 +5516,7 @@ class Spoom::Sorbet::Translate::SorbetSigsToRBSComments < ::Spoom::Sorbet::Trans
   end
   def visit_scope(node, &block); end
 
-  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:179
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/sorbet_sigs_to_rbs_comments.rb:188
   sig { params(node: ::Prism::CallNode).void }
   def visit_sig(node); end
 end
@@ -5121,6 +5568,88 @@ class Spoom::Sorbet::Translate::Translator < ::Spoom::Visitor
   def sorbet_sig?(node); end
 end
 
+# The outcome of comparing an original source with its rewritten form.
+#
+# pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:63
+class Spoom::Sorbet::Translate::ValidationResult
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:87
+  sig do
+    params(
+      missing_from_rewritten_output: T::Array[{landmark_id: ::String, line: ::Integer}],
+      excess_in_rewritten_output: T::Array[{landmark_id: ::String, line: ::Integer}],
+      on_wrong_line: T::Array[{landmark_id: ::String, expected: T::Array[::Integer], actual: T::Array[::Integer]}]
+    ).void
+  end
+  def initialize(missing_from_rewritten_output:, excess_in_rewritten_output:, on_wrong_line:); end
+
+  # Human-readable, one-per-line descriptions of every difference. Empty when
+  # the result is valid.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:104
+  sig { returns(T::Array[::String]) }
+  def errors; end
+
+  # Landmarks present in the rewrite with no match in the original.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:76
+  sig { returns(T::Array[{landmark_id: ::String, line: ::Integer}]) }
+  def excess_in_rewritten_output; end
+
+  # Landmarks present in the original but missing from the rewrite.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:72
+  sig { returns(T::Array[{landmark_id: ::String, line: ::Integer}]) }
+  def missing_from_rewritten_output; end
+
+  # Landmarks present in both sources, but that moved to a different line.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:80
+  sig { returns(T::Array[{landmark_id: ::String, expected: T::Array[::Integer], actual: T::Array[::Integer]}]) }
+  def on_wrong_line; end
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:119
+  sig { params(printer: T.untyped).void }
+  def pretty_print(printer); end
+
+  # True when every landmark survived the rewrite on its original line.
+  #
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:95
+  sig { returns(T::Boolean) }
+  def valid?; end
+
+  private
+
+  # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:137
+  sig { params(lines: T::Array[::Integer]).returns(::String) }
+  def format_lines(lines); end
+end
+
+Spoom::Sorbet::Translate::ValidationResult::LandmarkLocation = T.type_alias { {landmark_id: ::String, line: ::Integer} }
+Spoom::Sorbet::Translate::ValidationResult::MovedLandmark = T.type_alias { {landmark_id: ::String, expected: T::Array[::Integer], actual: T::Array[::Integer]} }
+
+# Checks that a translation preserved the lines of every "landmark" (e.g. classes, method defs, and so on)
+# so line numbers in the rewritten output still line up with the original source.
+#
+# pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:9
+module Spoom::Sorbet::Translate::Validator
+  class << self
+    # Compares the landmarks in both sources and returns a result describing
+    # what changed:
+    #   missing_from_rewritten_output - dropped: an occurrence in the original
+    #                                   that is gone from the rewrite
+    #   excess_in_rewritten_output    - added: an occurrence in the rewrite with
+    #                                   no match in the original
+    #   on_wrong_line                 - survived but moved to a different line
+    #
+    # pkg:gem/spoom#lib/spoom/sorbet/translate/validator.rb:25
+    sig { params(original: ::String, rewritten: ::String).returns(::Spoom::Sorbet::Translate::ValidationResult) }
+    def validate(original, rewritten); end
+  end
+end
+
+Spoom::Sorbet::Translate::Validator::LandmarkID = T.type_alias { ::String }
+Spoom::Sorbet::Translate::Validator::Landmarks = T.type_alias { T::Hash[::String, T::Array[::Integer]] }
+
 # This module provides a simple API to rewrite source code.
 #
 # Using a `Rewriter`, you can build a list of changes to apply to a source file
diff --git a/sorbet/rbi/gems/state_machines@0.201.0.rbi b/sorbet/rbi/gems/state_machines@0.202.0.rbi
similarity index 99%
rename from sorbet/rbi/gems/state_machines@0.201.0.rbi
rename to sorbet/rbi/gems/state_machines@0.202.0.rbi
index 17c15d64c..b0aebc74c 100644
--- a/sorbet/rbi/gems/state_machines@0.201.0.rbi
+++ b/sorbet/rbi/gems/state_machines@0.202.0.rbi
@@ -23,7 +23,6 @@ module StateMachines; end
 #
 # pkg:gem/state_machines#lib/state_machines/matcher.rb:25
 class StateMachines::AllMatcher < ::StateMachines::Matcher
-  include ::Singleton::SingletonInstanceMethods
   include ::Singleton
   extend ::Singleton::SingletonClassMethods
 
@@ -1352,7 +1351,6 @@ end
 #
 # pkg:gem/state_machines#lib/state_machines/matcher.rb:104
 class StateMachines::LoopbackMatcher < ::StateMachines::Matcher
-  include ::Singleton::SingletonInstanceMethods
   include ::Singleton
   extend ::Singleton::SingletonClassMethods
 
@@ -1721,7 +1719,7 @@ end
 # module that gets included in every Object.  As a result, state_machine will
 # generate the following warning:
 #
-#   Instance method "open" is already defined in Object, use generic helper instead or set StateMachines::Machine.ignore_method_conflicts = true.
+#   Instance method "open" is already defined in Object, use generic helper instead or set StateMachines::Machine.ignore_method_conflicts = true. Defining :state state machine on Vehicle.
 #
 # Even though you may not be using Kernel's implementation of the "open"
 # instance method, state_machine isn't aware of this and, as a result, stays
@@ -1810,7 +1808,7 @@ class StateMachines::Machine
   # Determines whether an action hook was defined for firing attribute-based
   # event transitions when the configured action gets called.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:589
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:588
   def action_hook?(self_only = T.unsafe(nil)); end
 
   # The callbacks to invoke before/after a transition is performed
@@ -1860,14 +1858,14 @@ class StateMachines::Machine
   # pkg:gem/state_machines#lib/state_machines/machine.rb:515
   def define_helper(scope, method, *_arg2, **_arg3, &block); end
 
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:583
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:582
   def draw(**_arg0); end
 
   # Gets a description of the errors for the given object.  This is used to
   # provide more detailed information when an InvalidTransition exception is
   # raised.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:543
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:542
   def errors_for(_object); end
 
   # The events that trigger transitions.  These are sorted, by default, in
@@ -1879,14 +1877,14 @@ class StateMachines::Machine
   # Generates the message to use when invalidating the given object after
   # failing to transition on a specific event
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:554
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:553
   def generate_message(name, values = T.unsafe(nil)); end
 
   # Marks the given object as invalid with the given message.
   #
   # By default, this is a no-op.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:538
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:537
   def invalidate(_object, _attribute, _message, _values = T.unsafe(nil)); end
 
   # The name of the machine, used for scoping methods generated for the
@@ -1907,14 +1905,14 @@ class StateMachines::Machine
   # pkg:gem/state_machines#lib/state_machines/machine.rb:442
   def owner_class; end
 
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:579
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:578
   def renderer; end
 
   # Resets any errors previously added when invalidating the given object.
   #
   # By default, this is a no-op.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:550
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:549
   def reset(_object); end
 
   # A list of all of the states known to this state machine.  This will pull
@@ -1941,31 +1939,31 @@ class StateMachines::Machine
   # default, this will not run any transactions since the changes aren't
   # taking place within the context of a database.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:571
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:570
   def within_transaction(object, &_arg1); end
 
   protected
 
   # Runs additional initialization hooks.  By default, this is a no-op.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:596
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:595
   def after_initialize; end
 
   # Gets the initial attribute value defined by the owner class (outside of
   # the machine's definition). By default, this is always nil.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:605
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:604
   def owner_class_attribute_default; end
 
   # Checks whether the given state matches the attribute default specified
   # by the owner class
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:611
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:610
   def owner_class_attribute_default_matches?(state); end
 
   # Always yields
   #
-  # pkg:gem/state_machines#lib/state_machines/machine.rb:599
+  # pkg:gem/state_machines#lib/state_machines/machine.rb:598
   def transaction(_object); end
 end
 
@@ -3413,9 +3411,24 @@ module StateMachines::Machine::Utilities
   # Adds sibling machine configurations to the current machine.  This
   # will add states from other machines that have the same attribute.
   #
-  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:78
+  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:105
   def add_sibling_machine_configs; end
 
+  # Looks up the source location of the conflicting method.  Returns nil
+  # for methods without a Ruby source (e.g. C-defined methods like
+  # Kernel#fail) and for the machine's own helper modules, where the
+  # location would just point inside this gem
+  #
+  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:76
+  def conflicting_method_location(scope, method, defined_in); end
+
+  # Generates the warning message for a method conflict, including where
+  # the conflicting method was defined (when it has a Ruby source
+  # location) and which class the state machine is being defined on
+  #
+  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:61
+  def method_conflict_message(scope, method, defined_in); end
+
   # Determines whether there's already a helper method defined within the
   # given scope.  This is true only if one of the owner's ancestors defines
   # the method and is further along in the ancestor chain than this
@@ -3433,13 +3446,13 @@ module StateMachines::Machine::Utilities
   # Pluralizes the given word using #pluralize (if available) or simply
   # adding an "s" to the end of the word
   #
-  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:60
+  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:87
   def pluralize(word); end
 
   # Generates the results for the given scope based on one or more states to
   # filter by
   #
-  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:71
+  # pkg:gem/state_machines#lib/state_machines/machine/utilities.rb:98
   def run_scope(scope, machine, klass, states); end
 
   # Looks up other machines that have been defined in the owner class and
@@ -5047,14 +5060,9 @@ module StateMachines::SyntaxValidator
   def validate!(code, filename = T.unsafe(nil)); end
 
   class << self
-    # Lazily pick the best backend for this platform
-    # Prefer RubyVM for performance on CRuby, fallback to eval for compatibility
-    #
     # pkg:gem/state_machines#lib/state_machines/syntax_validator.rb:24
     def backend; end
 
-    # Public API: raises SyntaxError if code is invalid
-    #
     # pkg:gem/state_machines#lib/state_machines/syntax_validator.rb:11
     def validate!(code, filename = T.unsafe(nil)); end
   end
@@ -5405,7 +5413,7 @@ class StateMachines::Transition
   # exception will not bubble up to the caller since +after+ callbacks
   # should never halt the execution of a +perform+.
   #
-  # pkg:gem/state_machines#lib/state_machines/transition.rb:566
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:568
   def after; end
 
   # Runs the machine's +before+ callbacks for this transition.  Only
@@ -5415,9 +5423,15 @@ class StateMachines::Transition
   # Once the callbacks are run, they cannot be run again until this transition
   # is reset.
   #
-  # pkg:gem/state_machines#lib/state_machines/transition.rb:505
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:507
   def before(complete = T.unsafe(nil), index = T.unsafe(nil), &block); end
 
+  # Snapshots the current fiber's Thread.current storage, preserving object
+  # identity of the stored values
+  #
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:458
+  def capture_thread_locals; end
+
   # Gets a hash of the context defining this unique transition (including
   # event, from state, and to state).
   #
@@ -5427,7 +5441,7 @@ class StateMachines::Transition
   #   transition = StateMachines::Transition.new(Vehicle.new, machine, :ignite, :parked, :idling)
   #   transition.context    # => {:on => :ignite, :from => :parked, :to => :idling}
   #
-  # pkg:gem/state_machines#lib/state_machines/transition.rb:589
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:591
   def context; end
 
   # Runs a block that may get paused.  If the block doesn't pause, then
@@ -5447,13 +5461,13 @@ class StateMachines::Transition
   # around callbacks when the remainder of the callback will be executed at
   # a later point in time.
   #
-  # pkg:gem/state_machines#lib/state_machines/transition.rb:479
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:481
   def pause; end
 
   # Unwraps a result returned from a pausable fiber, re-raising any exception
   # captured inside the fiber and importing its exported thread storage
   #
-  # pkg:gem/state_machines#lib/state_machines/transition.rb:464
+  # pkg:gem/state_machines#lib/state_machines/transition.rb:466
   def unwrap_fiber_result(result); end
 end
 
diff --git a/sorbet/rbi/gems/yard@0.9.44.rbi b/sorbet/rbi/gems/yard@0.9.45.rbi
similarity index 98%
rename from sorbet/rbi/gems/yard@0.9.44.rbi
rename to sorbet/rbi/gems/yard@0.9.45.rbi
index b65f1f9a1..0d281bfb6 100644
--- a/sorbet/rbi/gems/yard@0.9.44.rbi
+++ b/sorbet/rbi/gems/yard@0.9.45.rbi
@@ -5,6 +5,9 @@
 # Please instead update this file by running `bin/tapioca gem yard`.
 
 
+# Keep track of Ruby version for compatibility code
+# @deprecated Use {YARD.ruby18?} or {YARD.ruby19?} instead.
+#
 # pkg:gem/yard#lib/yard.rb:61
 ::RUBY18 = T.let(T.unsafe(nil), FalseClass)
 
@@ -6443,7 +6446,7 @@ class YARD::Handlers::Ruby::PublicClassMethodHandler < ::YARD::Handlers::Ruby::B
   include ::YARD::Handlers::Ruby::DecoratorHandlerMethods
 end
 
-# Helper methods to parse @attr_* tags on a class.
+# Helper methods to document generated Struct and Data members.
 #
 # @deprecated The use of +@attr+ tags are deprecated since 0.8.0 in favour of
 #   the +@!attribute+ directive. This module should not be relied on.
@@ -6461,7 +6464,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [String] member the name of the member we're generating documentation for
   # @return [String] a docstring to be attached to the getter method for this member
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:62
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:82
   def add_reader_tags(klass, new_method, member); end
 
   # Creates the auto-generated docstring for the setter method of a struct's
@@ -6472,7 +6475,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [String] member the name of the member we're generating documentation for
   # @return [String] a docstring to be attached to the setter method for this member
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:77
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:97
   def add_writer_tags(klass, new_method, member); end
 
   # Creates the given member methods and attaches them to the given ClassObject.
@@ -6480,7 +6483,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [ClassObject] klass the class to generate attributes for
   # @param [Array<String>] members a list of member names
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:134
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:154
   def create_attributes(klass, members); end
 
   # Creates and registers a class object with the given name and superclass name.
@@ -6490,7 +6493,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [String] superclass the name of the superclass
   # @return [ClassObject] the class object for further processing/method attaching
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:92
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:112
   def create_class(classname, superclass); end
 
   # Determines whether to create an attribute method based on the class's
@@ -6501,7 +6504,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [Symbol] type (:read) reader method, or writer method?
   # @return [Boolean] should the attribute be created?
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:38
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:58
   def create_member_method?(klass, member, type = T.unsafe(nil)); end
 
   # Creates the getter (reader) method and attaches it to the class as an attribute.
@@ -6510,7 +6513,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [ClassObject] klass the class to attach the method to
   # @param [String] member the name of the member we're generating a method for
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:121
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:141
   def create_reader(klass, member); end
 
   # Creates the setter (writer) method and attaches it to the class as an attribute.
@@ -6519,7 +6522,7 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [ClassObject] klass the class to attach the method to
   # @param [String] member the name of the member we're generating a method for
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:104
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:124
   def create_writer(klass, member); end
 
   # Extracts the user's defined @member tag for a given class and its member. Returns
@@ -6538,9 +6541,28 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @param [ClassObject] klass the class with the attributes
   # @return [Array<String>] the list of members defined as attributes on the class
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:26
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:46
   def members_from_tags(klass); end
 
+  # Extracts the user's defined @param tag for a given generated member.
+  #
+  # @param [ClassObject] klass the class whose tags we're searching
+  # @param [String] member the name of the struct or data member we need
+  # @return [Tags::Tag, nil] the matching tag, or nil if not found
+  #
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:27
+  def parameter_tag_for_member(klass, member); end
+
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:175
+  def register_docstring(object, docstring = T.unsafe(nil), stmt = T.unsafe(nil)); end
+
+  # Registers an auto-generated member method without reapplying the class's
+  # docstring to it. The generated reader or writer receives its own docstring
+  # and tags immediately after registration.
+  #
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:167
+  def register_struct_member_method(method, &block); end
+
   # Gets the return type for the member in a nicely formatted string. Used
   # to be injected into auto-generated docstrings.
   #
@@ -6548,8 +6570,19 @@ module YARD::Handlers::Ruby::StructHandlerMethods
   # @return [String] the user-declared type of the struct member, or [Object] if
   #   the user did not define a type for this member.
   #
-  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:51
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:71
   def return_type_from_tag(member_tag); end
+
+  # Returns the tag that supplies a generated member's type. Existing @attr*
+  # tags take precedence over the more concise @param form.
+  #
+  # @param [ClassObject] klass the class whose tags we're searching
+  # @param [String] member the name of the struct or data member we need
+  # @param [Symbol] type reader method, or writer method?
+  # @return [Tags::Tag, nil] the tag supplying the type, or nil if not found
+  #
+  # pkg:gem/yard#lib/yard/handlers/ruby/struct_handler_methods.rb:38
+  def type_tag_for_member(klass, member, type = T.unsafe(nil)); end
 end
 
 # pkg:gem/yard#lib/yard/handlers/ruby/base.rb:53
@@ -8567,7 +8600,7 @@ YARD::Parser::Ruby::Legacy::RubyToken::EXPR_MID = T.let(T.unsafe(nil), Symbol)
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:308
 YARD::Parser::Ruby::Legacy::RubyToken::NEWLINE_TOKEN = T.let(T.unsafe(nil), YARD::Parser::Ruby::Legacy::RubyToken::TkNL)
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::OPASGN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8575,16 +8608,16 @@ class YARD::Parser::Ruby::Legacy::RubyToken::OPASGN < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkALIAS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkAMPER < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkAND < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkANDOP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8592,7 +8625,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkANDOP < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkAREF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8600,7 +8633,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkAREF < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkASET < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8608,10 +8641,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkASET < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkASSIGN < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkASSOC < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8619,10 +8652,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkASSOC < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkAT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkUnknownChar; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBACKQUOTE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8630,16 +8663,16 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBACKQUOTE < ::YARD::Parser::Ruby:
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBACKSLASH < ::YARD::Parser::Ruby::Legacy::RubyToken::TkUnknownChar; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBACK_REF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBEGIN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBITAND < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8647,7 +8680,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBITAND < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBITNOT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8655,7 +8688,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBITNOT < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBITOR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8663,7 +8696,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBITOR < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBITXOR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8671,7 +8704,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBITXOR < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkBREAK < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
 # Represents a block
@@ -8682,13 +8715,13 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkBlockContents < ::YARD::Parser::R
   def text; end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCASE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCLASS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCMP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8696,7 +8729,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkCMP < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8704,7 +8737,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON2 < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8712,7 +8745,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON2 < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON3 < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8720,22 +8753,22 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkCOLON3 < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCOMMA < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCOMMENT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkCONSTANT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDEF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDEFINED < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDIV < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8743,16 +8776,16 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkDIV < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDO < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDOLLAR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkUnknownChar; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDOT < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDOT2 < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8760,7 +8793,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkDOT2 < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDOT3 < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8768,31 +8801,31 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkDOT3 < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDREGEXP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkNode; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDSTRING < ::YARD::Parser::Ruby::Legacy::RubyToken::TkNode; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkDXSTRING < ::YARD::Parser::Ruby::Legacy::RubyToken::TkNode; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkELSE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkELSIF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkEND < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkEND_OF_SCRIPT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkWhitespace; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkENSURE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkEQ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8800,7 +8833,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkEQ < ::YARD::Parser::Ruby::Legacy
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkEQQ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8811,19 +8844,19 @@ end
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:115
 class YARD::Parser::Ruby::Legacy::RubyToken::TkError < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkFALSE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkFID < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkFLOAT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkFOR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkGEQ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8831,7 +8864,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkGEQ < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkGT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8839,25 +8872,25 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkGT < ::YARD::Parser::Ruby::Legacy
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkGVAR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkIDENTIFIER < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkIF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkIF_MOD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkIN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkINTEGER < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkIVAR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
 # Represents a Ruby identifier
@@ -8876,16 +8909,16 @@ end
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:81
 class YARD::Parser::Ruby::Legacy::RubyToken::TkKW < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLABEL < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLBRACE < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLBRACK < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLEQ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8893,10 +8926,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkLEQ < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLPAREN < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLSHFT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8904,7 +8937,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkLSHFT < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkLT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8912,7 +8945,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkLT < ::YARD::Parser::Ruby::Legacy
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkMATCH < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8920,7 +8953,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkMATCH < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkMINUS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8928,7 +8961,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkMINUS < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkMOD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8936,10 +8969,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkMOD < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkMODULE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkMULT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8947,7 +8980,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkMULT < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNEQ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8955,16 +8988,16 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkNEQ < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNEXT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNIL < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNL < ::YARD::Parser::Ruby::Legacy::RubyToken::TkWhitespace; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNMATCH < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8972,10 +9005,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkNMATCH < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNOT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNOTOP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -8983,7 +9016,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkNOTOP < ::YARD::Parser::Ruby::Leg
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkNTH_REF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:63
@@ -9001,10 +9034,10 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkOPASGN < ::YARD::Parser::Ruby::Le
   def op; end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkOR < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkOROP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9018,7 +9051,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkOp < ::YARD::Parser::Ruby::Legacy
   def name; end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkPLUS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9026,7 +9059,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkPLUS < ::YARD::Parser::Ruby::Lega
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkPOW < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9034,7 +9067,7 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkPOW < ::YARD::Parser::Ruby::Legac
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkQUESTION < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9042,31 +9075,31 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkQUESTION < ::YARD::Parser::Ruby::
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRBRACE < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRBRACK < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkREDO < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkREGEXP < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRESCUE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRETRY < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRETURN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRPAREN < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkRSHFT < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9080,28 +9113,28 @@ end
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:271
 YARD::Parser::Ruby::Legacy::RubyToken::TkReading2Token = T.let(T.unsafe(nil), Hash)
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSELF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSEMICOLON < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSPACE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkWhitespace; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSTAR < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSTRING < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSUPER < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSYMBEG < ::YARD::Parser::Ruby::Legacy::RubyToken::TkId; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkSYMBOL < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
 # Represents an end statement
@@ -9115,13 +9148,13 @@ end
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:272
 YARD::Parser::Ruby::Legacy::RubyToken::TkSymbol2Token = T.let(T.unsafe(nil), Hash)
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkTHEN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkTRUE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUMINUS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9129,22 +9162,22 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkUMINUS < ::YARD::Parser::Ruby::Le
   end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUNDEF < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUNLESS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUNLESS_MOD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUNTIL < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUNTIL_MOD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkUPLUS < ::YARD::Parser::Ruby::Legacy::RubyToken::TkOp
   class << self
     # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:298
@@ -9169,13 +9202,13 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkVal < ::YARD::Parser::Ruby::Legac
   def initialize(line_no, char_no, value = T.unsafe(nil)); end
 end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkWHEN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkWHILE < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkWHILE_MOD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
 # Represents whitespace
@@ -9183,22 +9216,22 @@ class YARD::Parser::Ruby::Legacy::RubyToken::TkWHILE_MOD < ::YARD::Parser::Ruby:
 # pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:68
 class YARD::Parser::Ruby::Legacy::RubyToken::TkWhitespace < ::YARD::Parser::Ruby::Legacy::RubyToken::Token; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkXSTRING < ::YARD::Parser::Ruby::Legacy::RubyToken::TkVal; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TkYIELD < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::Tk__FILE__ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::Tk__LINE__ < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TklBEGIN < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
-# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:282
+# pkg:gem/yard#lib/yard/parser/ruby/legacy/ruby_lex.rb:281
 class YARD::Parser::Ruby::Legacy::RubyToken::TklEND < ::YARD::Parser::Ruby::Legacy::RubyToken::TkKW; end
 
 # Represents a token in the Ruby lexer
@@ -10126,22 +10159,22 @@ class YARD::Parser::Ruby::RipperParser < ::Ripper
 
   private
 
-  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:747
+  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:750
   def add_comment(line, node = T.unsafe(nil), before_node = T.unsafe(nil), into = T.unsafe(nil)); end
 
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:286
   def add_token(token, data); end
 
-  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:671
+  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:674
   def comment_starts_line?(charno); end
 
-  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:669
+  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:672
   def compile_error(msg); end
 
-  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:778
+  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:781
   def freeze_tree(node = T.unsafe(nil)); end
 
-  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:681
+  # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:684
   def insert_comments; end
 
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:175
@@ -10153,12 +10186,6 @@ class YARD::Parser::Ruby::RipperParser < ::Ripper
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:168
   def on_array(other); end
 
-  # Ruby 3.0+ pattern matching: array patterns (SomeClass[a, b]) and find patterns
-  # (SomeClass[*pre, val, *post]) use [...] brackets, which fire on_lbracket and
-  # on_rbracket scanner events. The corresponding parser events are on_aryptn/on_fndptn
-  # (not on_aref), so we must clean up the bracket maps to prevent stale entries from
-  # corrupting source ranges of later array indexing expressions.
-  #
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:175
   def on_aryptn(*args); end
 
@@ -10201,13 +10228,6 @@ class YARD::Parser::Ruby::RipperParser < ::Ripper
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:168
   def on_hash(*args); end
 
-  # Ruby 3.0+ pattern matching: braced hash patterns ({key: val} syntax) fire
-  # on_lbrace and on_rbrace scanner events. The corresponding parser event is
-  # on_hshptn (not on_hash), so we must clean up the brace maps to prevent stale
-  # entries from corrupting source ranges of later hash literals and brace blocks.
-  # Bare hash patterns (key: val without braces) fire no brace scanner events, so
-  # we only clean up when @map[:rbrace] confirms a closing brace was scanned.
-  #
   # pkg:gem/yard#lib/yard/parser/ruby/ruby_parser.rb:175
   def on_hshptn(*args); end
 
@@ -11870,12 +11890,20 @@ end
 # pkg:gem/yard#lib/yard/autoload.rb:230
 module YARD::Server
   class << self
+    # Normalizes an HTTP request path into a relative command path.
+    # @api private
+    # @param [String] path the request path to normalize
+    # @return [String] a relative path using forward slashes
+    #
+    # pkg:gem/yard#lib/yard/server.rb:8
+    def clean_path(path); end
+
     # Registers a static path to be used in static asset lookup.
     # @param [String] path the pathname to register
     # @return [void]
     # @since 0.6.2
     #
-    # pkg:gem/yard#lib/yard/server.rb:8
+    # pkg:gem/yard#lib/yard/server.rb:17
     def register_static_path(path); end
   end
 end
@@ -12802,8 +12830,6 @@ module YARD::Server::HTTPUtils
     # pkg:gem/yard#lib/yard/server/http_utils.rb:449
     def _unescape(str, regex); end
 
-    # Removes quotes and escapes from +str+
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:228
     def dequote(str); end
 
@@ -12827,56 +12853,33 @@ module YARD::Server::HTTPUtils
     # pkg:gem/yard#lib/yard/server/http_utils.rb:497
     def escape_path(str); end
 
-    # Loads Apache-compatible mime.types in +file+.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:128
     def load_mime_types(file); end
 
-    # Returns the mime type of +filename+ from the list in +mime_tab+.  If no
-    # mime type was found application/octet-stream is returned.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:139
     def mime_type(filename, mime_tab); end
 
-    # Normalizes a request path.  Raises an exception if the path cannot be
-    # normalized.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:42
     def normalize_path(path); end
 
-    # Parses form data in +io+ with the given +boundary+
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:421
     def parse_form_data(io, boundary); end
 
-    # Parses an HTTP header +raw+ into a hash of header fields with an Array
-    # of values.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:170
     def parse_header(raw); end
 
-    # Parses the query component of a URI in +str+
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:390
     def parse_query(str); end
 
-    # Parses q values in +value+ as used in Accept headers.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:218
     def parse_qvalues(value); end
 
-    # Parses a Range header value +ranges_specifier+
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:197
     def parse_range_header(ranges_specifier); end
 
-    # Quotes and escapes quotes in +str+
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:236
     def quote(str); end
 
-    # Splits a header value +str+ according to HTTP specification.
-    #
     # pkg:gem/yard#lib/yard/server/http_utils.rb:179
     def split_header_value(str); end
 
@@ -14850,15 +14853,18 @@ class YARD::Tags::TypesExplainer::Parser
 
   private
 
-  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:264
+  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:273
   def create_type(name); end
 
-  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:233
+  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:241
   def parse_hash_collection(name); end
 
+  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:184
+  def parse_until(until_tokens); end
+
   # @return [Array<Type>]
   #
-  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:215
+  # pkg:gem/yard#lib/yard/tags/types_explainer.rb:223
   def parse_with_handlers; end
 
   class << self
@@ -15602,11 +15608,6 @@ module YARD::Templates::Helpers::HtmlHelper
   def urlencode(text); end
 
   class << self
-    # Escapes a URL
-    #
-    # @param [String] text the URL
-    # @return [String] the escaped URL
-    #
     # pkg:gem/yard#lib/yard/templates/helpers/html_helper.rb:51
     def urlencode(text); end
   end
@@ -16156,18 +16157,18 @@ end
 class YARD::Templates::Helpers::Markup::RDocMarkup
   # @param text [String]
   #
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:42
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:46
   def initialize(text); end
 
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:35
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:39
   def from_path; end
 
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:35
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:39
   def from_path=(_arg0); end
 
   # @return [String]
   #
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:52
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:56
   def to_html; end
 
   private
@@ -16177,14 +16178,14 @@ class YARD::Templates::Helpers::Markup::RDocMarkup
   #
   # @todo Refactor into own SimpleMarkup subclass
   #
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:89
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:93
   def fix_dash_dash(text); end
 
   # Fixes RDoc behaviour with ++ only supporting alphanumeric text.
   #
   # @todo Refactor into own SimpleMarkup subclass
   #
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:68
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:72
   def fix_typewriter(text); end
 end
 
@@ -16193,21 +16194,21 @@ YARD::Templates::Helpers::Markup::RDocMarkup::MARKUP = RDoc::Markup
 
 # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:13
 class YARD::Templates::Helpers::Markup::RDocMarkupToHtml < ::RDoc::Markup::ToHtml
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:16
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:20
   def initialize; end
 
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:102
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:106
   def accept_paragraph(*args); end
 
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:95
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:99
   def from_path; end
 
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:95
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:99
   def from_path=(_arg0); end
 
   # Disable auto-link of URLs
   #
-  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:98
+  # pkg:gem/yard#lib/yard/templates/helpers/markup/rdoc_markup.rb:102
   def handle_special_HYPERLINK(special); end
 end