diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c57fdd5..f2639d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,9 +14,8 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.1.0
-          - 3.2.2
-          - 3.3.2
+          - 3.4
+          - 4.0
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index e5870a9..b5b3a1e 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,28 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 400`
-# on 2024-06-13 00:13:12 UTC using RuboCop version 1.64.1.
+# on 2026-03-03 21:20:49 UTC using RuboCop version 1.85.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, Include, AllowedGems.
-# SupportedStyles: required, forbidden
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/GemVersion:
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'Gemfile'
+    - 'baes.gemspec'
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
     - 'lib/baes/actions/bisect.rb'
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -44,7 +41,7 @@ RSpec/BeNil:
   Exclude:
     - 'spec/baes_spec.rb'
 
-# Offense count: 10
+# Offense count: 8
 # Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
   Exclude:
@@ -59,7 +56,7 @@ RSpec/MessageExpectation:
   Exclude:
     - 'spec/support/stub_system.rb'
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -78,3 +75,11 @@ RSpec/MultipleExpectations:
 RSpec/NoExpectationExample:
   Exclude:
     - 'spec/baes/actions/bisect_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: AllowedClasses.
+Style/OneClassPerFile:
+  Exclude:
+    - 'lib/baes.rb'
+    - 'spec/support/fake_git.rb'
+    - 'spec/support/matchers/capture_configured_output.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index cfcb426..0665783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,17 +6,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
+    bigdecimal (4.0.1)
     diff-lcs (1.6.2)
     docile (1.4.1)
     json (2.18.1)
+    json-schema (6.1.0)
+      addressable (~> 2.8)
+      bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
+    mcp (0.8.0)
+      json-schema (>= 4.1)
     parallel (1.27.0)
     parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     prism (1.9.0)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.3.1)
@@ -30,14 +39,15 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.84.2)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
diff --git a/baes.gemspec b/baes.gemspec
index 3e4ca19..15da782 100644
--- a/baes.gemspec
+++ b/baes.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "a simple tool for bulk rebasing branches"
   spec.homepage      = "https://github.com/mockdeep/baes"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 3.0"
+  spec.required_ruby_version = ">= 3.4"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/mockdeep/baes"