diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/analytics.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/analytics.rbi
index d496f91c546c70..72242d386bea05 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/analytics.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/analytics.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Analytics`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Analytics`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Analytics
+  sig { returns(Homebrew::Cmd::Analytics::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Analytics::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/autoremove.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/autoremove.rbi
index 8a7b4aad80cb6e..50005dce0cfe20 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/autoremove.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/autoremove.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Autoremove`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Autoremove`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Autoremove
+  sig { returns(Homebrew::Cmd::Autoremove::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Autoremove::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cache.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cache.rbi
index eacc7d74bb15f7..940357ae4fc814 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cache.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cache.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Cache`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Cache`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Cache
+  sig { returns(Homebrew::Cmd::Cache::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Cache::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/caskroom.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/caskroom.rbi
index eb4ba9c680f24e..46894aa2fc481e 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/caskroom.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/caskroom.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Caskroom`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Caskroom`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Caskroom
+  sig { returns(Homebrew::Cmd::Caskroom::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Caskroom::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cellar.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cellar.rbi
index 24f5600ac9a64e..d85cc4346bfe1d 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cellar.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cellar.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Cellar`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Cellar`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Cellar
+  sig { returns(Homebrew::Cmd::Cellar::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Cellar::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cleanup_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cleanup_cmd.rbi
index 79e3eb89c0719f..1ba192edf1a84e 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cleanup_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/cleanup_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::CleanupCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::CleanupCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::CleanupCmd
+  sig { returns(Homebrew::Cmd::CleanupCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::CleanupCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/commands_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/commands_cmd.rbi
index 0fd4c2534f8077..94d07bc0592eae 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/commands_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/commands_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::CommandsCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::CommandsCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::CommandsCmd
+  sig { returns(Homebrew::Cmd::CommandsCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::CommandsCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def include_aliases?; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/completions_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/completions_cmd.rbi
index af913b74847e58..d9de261da56f08 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/completions_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/completions_cmd.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::CompletionsCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::CompletionsCmd`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::CompletionsCmd
+  sig { returns(Homebrew::Cmd::CompletionsCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::CompletionsCmd::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/config.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/config.rbi
index 526c2d2e1de9e3..3ae8b225076351 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/config.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/config.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Config`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Config`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Config
+  sig { returns(Homebrew::Cmd::Config::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Config::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/deps.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/deps.rbi
index e817bdcc1ed4e0..032a6215699e5d 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/deps.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/deps.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Deps`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Deps`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Deps
+  sig { returns(Homebrew::Cmd::Deps::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Deps::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/desc.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/desc.rbi
index 6c23eb9b34b88f..a32eee082fd9cf 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/desc.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/desc.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Desc`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Desc`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Desc
+  sig { returns(Homebrew::Cmd::Desc::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Desc::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/developer.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/developer.rbi
index 168eb49c3384cb..d2c60ba163ba20 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/developer.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/developer.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Developer`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Developer`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Developer
+  sig { returns(Homebrew::Cmd::Developer::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Developer::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/docs.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/docs.rbi
index 539fd98a12da3f..3db3a5e29452b6 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/docs.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/docs.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Docs`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Docs`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Docs
+  sig { returns(Homebrew::Cmd::Docs::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Docs::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/doctor.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/doctor.rbi
index cc52a9410f8096..88cb59b468f815 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/doctor.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/doctor.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Doctor`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Doctor`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Doctor
+  sig { returns(Homebrew::Cmd::Doctor::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Doctor::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def D?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/env.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/env.rbi
index 2602bb05ce8c0c..063f6fe0cbe1fd 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/env.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/env.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Env`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Env`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Env
+  sig { returns(Homebrew::Cmd::Env::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Env::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def plain?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/fetch_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/fetch_cmd.rbi
index 47654e9dcf5bad..6f8dca3581ac7b 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/fetch_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/fetch_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::FetchCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::FetchCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::FetchCmd
+  sig { returns(Homebrew::Cmd::FetchCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::FetchCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/gist_logs.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/gist_logs.rbi
index 16027807346b7c..a87797a4f677fc 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/gist_logs.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/gist_logs.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::GistLogs`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::GistLogs`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::GistLogs
+  sig { returns(Homebrew::Cmd::GistLogs::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::GistLogs::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def n?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/help_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/help_cmd.rbi
index bba165056a24f7..381c96f16fd9b4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/help_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/help_cmd.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::HelpCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::HelpCmd`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::HelpCmd
+  sig { returns(Homebrew::Cmd::HelpCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::HelpCmd::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/home.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/home.rbi
index 641e31c0ed96c5..f1c3153d3cdcd7 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/home.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/home.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Home`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Home`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Home
+  sig { returns(Homebrew::Cmd::Home::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Home::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/info.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/info.rbi
index 40249a580bee01..ac2c212624d819 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/info.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/info.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Info`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Info`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Info
+  sig { returns(Homebrew::Cmd::Info::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Info::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def analytics?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/install_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/install_cmd.rbi
index fd1743330dea43..b7982882748d75 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/install_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/install_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::InstallCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::InstallCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::InstallCmd
+  sig { returns(Homebrew::Cmd::InstallCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::InstallCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/leaves.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/leaves.rbi
index 1fa72d70fdf20e..bbbbc0641eeeaa 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/leaves.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/leaves.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Leaves`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Leaves`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Leaves
+  sig { returns(Homebrew::Cmd::Leaves::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Leaves::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def installed_as_dependency?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/link.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/link.rbi
index 40d33751febe74..bf6301ba3cee7c 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/link.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/link.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Link`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Link`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Link
+  sig { returns(Homebrew::Cmd::Link::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Link::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/list.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/list.rbi
index a5b8ec328e373d..30f707efbb589d 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/list.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/list.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::List`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::List`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::List
+  sig { returns(Homebrew::Cmd::List::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::List::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/log.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/log.rbi
index 8d5115755e18da..bc5430ddac0b2b 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/log.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/log.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Log`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Log`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Log
+  sig { returns(Homebrew::Cmd::Log::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Log::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/migrate.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/migrate.rbi
index cbf369859c52c1..2bc1823664361f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/migrate.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/migrate.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Migrate`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Migrate`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Migrate
+  sig { returns(Homebrew::Cmd::Migrate::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Migrate::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/missing.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/missing.rbi
index 6bb5bec5aa61c0..4a357b5f5afbaa 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/missing.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/missing.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Missing`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Missing`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Missing
+  sig { returns(Homebrew::Cmd::Missing::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Missing::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(T::Array[String])) }
   def hide; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/nodenv_sync.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/nodenv_sync.rbi
index ff38454ccafc71..0cabaa6bbf18a2 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/nodenv_sync.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/nodenv_sync.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::NodenvSync`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::NodenvSync`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::NodenvSync
+  sig { returns(Homebrew::Cmd::NodenvSync::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::NodenvSync::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/options_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/options_cmd.rbi
index f603902f962036..80910bdde28785 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/options_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/options_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::OptionsCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::OptionsCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::OptionsCmd
+  sig { returns(Homebrew::Cmd::OptionsCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::OptionsCmd::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def command; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/outdated.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/outdated.rbi
index 4613bd98f71ef1..481970e6d1dea1 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/outdated.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/outdated.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Outdated`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Outdated`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Outdated
+  sig { returns(Homebrew::Cmd::Outdated::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Outdated::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pin.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pin.rbi
index 9f477325e23112..1befcaadb6e3b3 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pin.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pin.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Pin`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Pin`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Pin
+  sig { returns(Homebrew::Cmd::Pin::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Pin::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postgresql_upgrade_database.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postgresql_upgrade_database.rbi
index 7504382d18f7fd..5d90e72a26c8b0 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postgresql_upgrade_database.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postgresql_upgrade_database.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::PostgresqlUpgradeDatabase`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::PostgresqlUpgradeDatabase`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::PostgresqlUpgradeDatabase
+  sig { returns(Homebrew::Cmd::PostgresqlUpgradeDatabase::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::PostgresqlUpgradeDatabase::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postinstall.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postinstall.rbi
index ec4a10984b5810..45e80125dc5d1a 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postinstall.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/postinstall.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Postinstall`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Postinstall`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Postinstall
+  sig { returns(Homebrew::Cmd::Postinstall::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Postinstall::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/prefix.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/prefix.rbi
index 3810a94f98f726..8492c5a4b82e98 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/prefix.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/prefix.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Prefix`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Prefix`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Prefix
+  sig { returns(Homebrew::Cmd::Prefix::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Prefix::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def installed?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pyenv_sync.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pyenv_sync.rbi
index 2f96bcc70cc61a..2f5e0e55f0caed 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pyenv_sync.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/pyenv_sync.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::PyenvSync`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::PyenvSync`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::PyenvSync
+  sig { returns(Homebrew::Cmd::PyenvSync::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::PyenvSync::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/rbenv_sync.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/rbenv_sync.rbi
index 7b53503b0956bb..a6487ea51750d9 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/rbenv_sync.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/rbenv_sync.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::RbenvSync`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::RbenvSync`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::RbenvSync
+  sig { returns(Homebrew::Cmd::RbenvSync::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::RbenvSync::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/readall_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/readall_cmd.rbi
index 0fb752086d8654..cb901236660f0f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/readall_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/readall_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::ReadallCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::ReadallCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::ReadallCmd
+  sig { returns(Homebrew::Cmd::ReadallCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::ReadallCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def aliases?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/reinstall.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/reinstall.rbi
index ea8ee9464821b1..a9815cce95ae06 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/reinstall.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/reinstall.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Reinstall`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Reinstall`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Reinstall
+  sig { returns(Homebrew::Cmd::Reinstall::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Reinstall::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def adopt?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/repository.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/repository.rbi
index f9a8b655abe1af..e907f1aa31171f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/repository.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/repository.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Repository`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Repository`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Repository
+  sig { returns(Homebrew::Cmd::Repository::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Repository::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/search_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/search_cmd.rbi
index f106b19b09f91c..9e01098d499068 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/search_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/search_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::SearchCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::SearchCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::SearchCmd
+  sig { returns(Homebrew::Cmd::SearchCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::SearchCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def archlinux?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_cmd.rbi
index 2b0e5e2a08ea59..ea701845e0ac10 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::TapCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::TapCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::TapCmd
+  sig { returns(Homebrew::Cmd::TapCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::TapCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def custom_remote?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_info.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_info.rbi
index e57d0e270fad31..a14a355b1cf97f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_info.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/tap_info.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::TapInfo`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::TapInfo`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::TapInfo
+  sig { returns(Homebrew::Cmd::TapInfo::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::TapInfo::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def installed?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uninstall_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uninstall_cmd.rbi
index e7211a0374295c..e1c33f4f0b2422 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uninstall_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uninstall_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::UninstallCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::UninstallCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::UninstallCmd
+  sig { returns(Homebrew::Cmd::UninstallCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::UninstallCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unlink_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unlink_cmd.rbi
index 932b24c3f8fb4c..b45af9cd05d37e 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unlink_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unlink_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::UnlinkCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::UnlinkCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::UnlinkCmd
+  sig { returns(Homebrew::Cmd::UnlinkCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::UnlinkCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unpin.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unpin.rbi
index 512051dc7e624f..bfa92e8940dcb8 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unpin.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/unpin.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Unpin`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Unpin`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::Cmd::Unpin
+  sig { returns(Homebrew::Cmd::Unpin::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Unpin::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/untap.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/untap.rbi
index 4529a15ce4cff3..4845b253be19f5 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/untap.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/untap.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Untap`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Untap`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Untap
+  sig { returns(Homebrew::Cmd::Untap::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Untap::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def f?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/update_report.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/update_report.rbi
index 126a7046710955..fda2c973a7728f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/update_report.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/update_report.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::UpdateReport`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::UpdateReport`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::UpdateReport
+  sig { returns(Homebrew::Cmd::UpdateReport::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::UpdateReport::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def auto_update?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/upgrade_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/upgrade_cmd.rbi
index 6066de8f4974e9..be1ec458cbd9c8 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/upgrade_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/upgrade_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::UpgradeCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::UpgradeCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::UpgradeCmd
+  sig { returns(Homebrew::Cmd::UpgradeCmd::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::UpgradeCmd::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def appdir; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uses.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uses.rbi
index 4cc16b0dafb87d..48793b786a87f6 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uses.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/cmd/uses.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::Cmd::Uses`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::Cmd::Uses`.
 
-class Homebrew::CLI::Args
+class Homebrew::Cmd::Uses
+  sig { returns(Homebrew::Cmd::Uses::Args) }
+  def args; end
+end
+
+class Homebrew::Cmd::Uses::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
index 16e74567eddfa7..c86d4071ab949c 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/audit.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Audit`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Audit`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Audit
+  sig { returns(Homebrew::DevCmd::Audit::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Audit::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def D?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bottle.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bottle.rbi
index 045967d4ea48a3..9f3c5df3c7250f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bottle.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bottle.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Bottle`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Bottle`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Bottle
+  sig { returns(Homebrew::DevCmd::Bottle::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Bottle::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def committer; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
index dbd7f2470388f2..84c6f89a5423be 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Bump`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Bump`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Bump
+  sig { returns(Homebrew::DevCmd::Bump::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Bump::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_cask_pr.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_cask_pr.rbi
index a6e5bc2f25f17c..a1f2a81a3dcaf1 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_cask_pr.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_cask_pr.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::BumpCaskPr`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::BumpCaskPr`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::BumpCaskPr
+  sig { returns(Homebrew::DevCmd::BumpCaskPr::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::BumpCaskPr::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def commit?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
index 9ba7ec160a6005..b184ec45bc9519 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_formula_pr.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::BumpFormulaPr`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::BumpFormulaPr`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::BumpFormulaPr
+  sig { returns(Homebrew::DevCmd::BumpFormulaPr::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::BumpFormulaPr::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def commit?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_revision.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_revision.rbi
index 175d5c940e4fe8..5c56fafaa32ec3 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_revision.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_revision.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::BumpRevision`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::BumpRevision`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::BumpRevision
+  sig { returns(Homebrew::DevCmd::BumpRevision::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::BumpRevision::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_unversioned_casks.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_unversioned_casks.rbi
index 5709f4db42cc69..b6a8aab025cf02 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_unversioned_casks.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/bump_unversioned_casks.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::BumpUnversionedCasks`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::BumpUnversionedCasks`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::BumpUnversionedCasks
+  sig { returns(Homebrew::DevCmd::BumpUnversionedCasks::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::BumpUnversionedCasks::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/cat.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/cat.rbi
index a52441a6f11624..ca114eb63d3267 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/cat.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/cat.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Cat`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Cat`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Cat
+  sig { returns(Homebrew::DevCmd::Cat::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Cat::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/command.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/command.rbi
index 71834973bbca9d..ce831184e6a988 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/command.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/command.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Command`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Command`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::Command
+  sig { returns(Homebrew::DevCmd::Command::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Command::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/contributions.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/contributions.rbi
index 9a75800e096b82..197c0558916d8f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/contributions.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/contributions.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Contributions`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Contributions`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Contributions
+  sig { returns(Homebrew::DevCmd::Contributions::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Contributions::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def csv?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
index 3bf567dd0ee590..18ae0fd232bbfc 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/create.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Create`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Create`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Create
+  sig { returns(Homebrew::DevCmd::Create::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Create::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/determine_test_runners.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/determine_test_runners.rbi
index d8a99b6b8668a7..4a93a6f05fb156 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/determine_test_runners.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/determine_test_runners.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::DetermineTestRunners`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::DetermineTestRunners`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::DetermineTestRunners
+  sig { returns(Homebrew::DevCmd::DetermineTestRunners::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::DetermineTestRunners::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def all_supported?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
index dd03bcc1546ef6..bd0a9aef16d115 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/dispatch_build_bottle.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::DispatchBuildBottle`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::DispatchBuildBottle`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::DispatchBuildBottle
+  sig { returns(Homebrew::DevCmd::DispatchBuildBottle::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::DispatchBuildBottle::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def issue; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/edit.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/edit.rbi
index 15ca3ae4fc481e..1babb63b180fa0 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/edit.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/edit.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Edit`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Edit`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Edit
+  sig { returns(Homebrew::DevCmd::Edit::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Edit::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/extract.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/extract.rbi
index 017ea79baf2185..2ef817ac1acb7f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/extract.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/extract.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Extract`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Extract`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Extract
+  sig { returns(Homebrew::DevCmd::Extract::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Extract::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def f?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/formula_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/formula_cmd.rbi
index bd2cede936ada7..678bb45e749f71 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/formula_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/formula_cmd.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::FormulaCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::FormulaCmd`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::FormulaCmd
+  sig { returns(Homebrew::DevCmd::FormulaCmd::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::FormulaCmd::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_cask_api.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_cask_api.rbi
index d0dd1e83291fbe..69abcf65442941 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_cask_api.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_cask_api.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::GenerateCaskApi`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::GenerateCaskApi`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::GenerateCaskApi
+  sig { returns(Homebrew::DevCmd::GenerateCaskApi::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::GenerateCaskApi::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_formula_api.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_formula_api.rbi
index 8ec0dcb09d906b..fab1cf330efea5 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_formula_api.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_formula_api.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::GenerateFormulaApi`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::GenerateFormulaApi`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::GenerateFormulaApi
+  sig { returns(Homebrew::DevCmd::GenerateFormulaApi::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::GenerateFormulaApi::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dry_run?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_man_completions.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_man_completions.rbi
index 9bb5731d42f60b..66c53bf45d3980 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_man_completions.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/generate_man_completions.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::GenerateManCompletions`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::GenerateManCompletions`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::GenerateManCompletions
+  sig { returns(Homebrew::DevCmd::GenerateManCompletions::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::GenerateManCompletions::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/install_bundler_gems.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/install_bundler_gems.rbi
index e1ae0f4d107f50..f1924a85b7cf3f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/install_bundler_gems.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/install_bundler_gems.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::InstallBundlerGems`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::InstallBundlerGems`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::InstallBundlerGems
+  sig { returns(Homebrew::DevCmd::InstallBundlerGems::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::InstallBundlerGems::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(T::Array[String])) }
   def add_groups; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/irb.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/irb.rbi
index 0355473a06e27b..658d40e85fb0c4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/irb.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/irb.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Irb`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Irb`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Irb
+  sig { returns(Homebrew::DevCmd::Irb::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Irb::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def examples?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/linkage.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/linkage.rbi
index 1ef48c80102547..a6d8b04c5dfdea 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/linkage.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/linkage.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Linkage`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Linkage`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Linkage
+  sig { returns(Homebrew::DevCmd::Linkage::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Linkage::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cached?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
index 00c63e7a94778c..c7ba2ca52682c4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/livecheck_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::LivecheckCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::LivecheckCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::LivecheckCmd
+  sig { returns(Homebrew::DevCmd::LivecheckCmd::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::LivecheckCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
index 5ba07148eedb5c..fb229719e7cd80 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_automerge.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::PrAutomerge`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::PrAutomerge`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::PrAutomerge
+  sig { returns(Homebrew::DevCmd::PrAutomerge::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::PrAutomerge::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def autosquash?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
index ee6d0987c5dfd5..5e12af54cf3adb 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_publish.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::PrPublish`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::PrPublish`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::PrPublish
+  sig { returns(Homebrew::DevCmd::PrPublish::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::PrPublish::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def autosquash?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
index fc8f71936728ba..15a68c9cdfaf8e 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_pull.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::PrPull`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::PrPull`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::PrPull
+  sig { returns(Homebrew::DevCmd::PrPull::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::PrPull::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def artifact; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_upload.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_upload.rbi
index 0fdb4ddac02014..2c96ac44bacbd3 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_upload.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/pr_upload.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::PrUpload`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::PrUpload`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::PrUpload
+  sig { returns(Homebrew::DevCmd::PrUpload::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::PrUpload::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def committer; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/prof.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/prof.rbi
index 27f3a84c69fdcd..23a5d339dd6b4f 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/prof.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/prof.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Prof`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Prof`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Prof
+  sig { returns(Homebrew::DevCmd::Prof::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Prof::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def stackprof?; end
 end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/release.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/release.rbi
index 2d470faece20c7..a523ae11008dc4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/release.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/release.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Release`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Release`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Release
+  sig { returns(Homebrew::DevCmd::Release::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Release::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def major?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/ruby.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/ruby.rbi
index ccf736e8419e78..eaadacd06e0a84 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/ruby.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/ruby.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Ruby`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Ruby`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Ruby
+  sig { returns(Homebrew::DevCmd::Ruby::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Ruby::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def e; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/sh.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/sh.rbi
index 763b2449631e1a..28bf3ce60cbfd7 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/sh.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/sh.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Sh`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Sh`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Sh
+  sig { returns(Homebrew::DevCmd::Sh::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Sh::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def c; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/style_cmd.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/style_cmd.rbi
index 889096563de0f2..54f7a5d76f3212 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/style_cmd.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/style_cmd.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::StyleCmd`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::StyleCmd`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::StyleCmd
+  sig { returns(Homebrew::DevCmd::StyleCmd::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::StyleCmd::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def cask?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tap_new.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tap_new.rbi
index 603694ec28279c..279224ad03a843 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tap_new.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tap_new.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::TapNew`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::TapNew`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::TapNew
+  sig { returns(Homebrew::DevCmd::TapNew::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::TapNew::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def branch; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/test.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/test.rbi
index 6e5f2fce29ee5e..020a142ee22799 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/test.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/test.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Test`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Test`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Test
+  sig { returns(Homebrew::DevCmd::Test::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Test::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def HEAD?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tests.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tests.rbi
index 821f5838312411..d3a1968b96f08e 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tests.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/tests.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Tests`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Tests`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Tests
+  sig { returns(Homebrew::DevCmd::Tests::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Tests::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def changed?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/typecheck.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/typecheck.rbi
index 349f03cd5aca31..6ab2f8ab9ac8fd 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/typecheck.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/typecheck.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Typecheck`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Typecheck`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Typecheck
+  sig { returns(Homebrew::DevCmd::Typecheck::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Typecheck::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def dir; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unbottled.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unbottled.rbi
index cdf69115af8e20..58015aca0a6fdb 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unbottled.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unbottled.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Unbottled`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Unbottled`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Unbottled
+  sig { returns(Homebrew::DevCmd::Unbottled::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Unbottled::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def dependents?; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unpack.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unpack.rbi
index 78d1a59a4d2412..c9addecff103a6 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unpack.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/unpack.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::Unpack`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::Unpack`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::Unpack
+  sig { returns(Homebrew::DevCmd::Unpack::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::Unpack::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def destdir; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_license_data.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_license_data.rbi
index ae2df30f40de9c..6b27fb593cf399 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_license_data.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_license_data.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::UpdateLicenseData`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::UpdateLicenseData`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::UpdateLicenseData
+  sig { returns(Homebrew::DevCmd::UpdateLicenseData::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::UpdateLicenseData::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_maintainers.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_maintainers.rbi
index ef10a5e67a9641..0dbf2817289735 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_maintainers.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_maintainers.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::UpdateMaintainers`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::UpdateMaintainers`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::UpdateMaintainers
+  sig { returns(Homebrew::DevCmd::UpdateMaintainers::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::UpdateMaintainers::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_python_resources.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_python_resources.rbi
index 8fcfbfaa4268e4..88bcc3fc6808bc 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_python_resources.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_python_resources.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::UpdatePythonResources`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::UpdatePythonResources`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::UpdatePythonResources
+  sig { returns(Homebrew::DevCmd::UpdatePythonResources::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::UpdatePythonResources::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(T::Array[String])) }
   def exclude_packages; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_sponsors.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_sponsors.rbi
index a2ac1a366e66fe..d1c5d5c2e73de3 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_sponsors.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_sponsors.rbi
@@ -4,4 +4,9 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::UpdateSponsors`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::UpdateSponsors`.
 
-class Homebrew::CLI::Args; end
+class Homebrew::DevCmd::UpdateSponsors
+  sig { returns(Homebrew::DevCmd::UpdateSponsors::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::UpdateSponsors::Args < Homebrew::CLI::Args; end
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_test.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_test.rbi
index 987dd06b54131d..bba6e22be763f4 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_test.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/update_test.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::UpdateTest`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::UpdateTest`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::UpdateTest
+  sig { returns(Homebrew::DevCmd::UpdateTest::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::UpdateTest::Args < Homebrew::CLI::Args
   sig { returns(T.nilable(String)) }
   def before; end
 
diff --git a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/vendor_gems.rbi b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/vendor_gems.rbi
index 9c441a982eaf74..e53330e85ef3b7 100644
--- a/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/vendor_gems.rbi
+++ b/Library/Homebrew/sorbet/rbi/dsl/homebrew/dev_cmd/vendor_gems.rbi
@@ -4,7 +4,12 @@
 # This is an autogenerated file for dynamic methods in `Homebrew::DevCmd::VendorGems`.
 # Please instead update this file by running `bin/tapioca dsl Homebrew::DevCmd::VendorGems`.
 
-class Homebrew::CLI::Args
+class Homebrew::DevCmd::VendorGems
+  sig { returns(Homebrew::DevCmd::VendorGems::Args) }
+  def args; end
+end
+
+class Homebrew::DevCmd::VendorGems::Args < Homebrew::CLI::Args
   sig { returns(T::Boolean) }
   def no_commit?; end