ruvim 0.4.0 → 0.6.0

data/lib/ruvim/app.rb

@@ -3,19 +3,22 @@
 require "json"
 require "fileutils"
 require_relative "file_watcher"
+require_relative "stream_mixer"
+require_relative "completion_manager"
+require_relative "key_handler"
 
 module RuVim
   class App
-    LARGE_FILE_ASYNC_THRESHOLD_BYTES = 64 * 1024 * 1024
-    LARGE_FILE_STAGED_PREFIX_BYTES = 8 * 1024 * 1024
-    ASYNC_FILE_READ_CHUNK_BYTES = 1 * 1024 * 1024
-    ASYNC_FILE_EVENT_FLUSH_BYTES = 4 * 1024 * 1024
-
+    StartupState = Struct.new(
+      :readonly, :diff_mode, :quickfix_errorfile, :session_file,
+      :nomodifiable, :follow, :time_path, :time_origin, :timeline,
+      :open_layout, :open_count, :skip_user_config, :config_path,
+      keyword_init: true
+    )
     def initialize(path: nil, paths: nil, stdin: STDIN, ui_stdin: nil, stdin_stream_mode: false, stdout: STDOUT, pre_config_actions: [], startup_actions: [], clean: false, skip_user_config: false, config_path: nil, readonly: false, diff_mode: false, quickfix_errorfile: nil, session_file: nil, nomodifiable: false, follow: false, restricted: false, verbose_level: 0, verbose_io: STDERR, startup_time_path: nil, startup_open_layout: nil, startup_open_count: nil)
       startup_paths = Array(paths || path).compact
       @ui_stdin = ui_stdin || stdin
       @stdin_stream_mode = !!stdin_stream_mode
-      @stdin_stream_source = @stdin_stream_mode ? stdin : nil
       @editor = Editor.new
       @terminal = Terminal.new(stdin: @ui_stdin, stdout:)
       @input = Input.new(@ui_stdin)
@@ -23,45 +26,57 @@ module RuVim
       @dispatcher = Dispatcher.new
       @keymaps = KeymapManager.new
       @signal_r, @signal_w = IO.pipe
-      @stream_event_queue = nil
-      @stream_reader_thread = nil
-      @stream_buffer_id = nil
-      @stream_stop_requested = false
-      @async_file_loads = {}
-      @follow_watchers = {}
-      @cmdline_history = Hash.new { |h, k| h[k] = [] }
-      @cmdline_history_index = nil
-      @cmdline_completion = nil
-      @pending_key_deadline = nil
-      @pending_ambiguous_invocation = nil
-      @insert_start_location = nil
-      @incsearch_preview = nil
       @needs_redraw = true
       @clean_mode = clean
-      @skip_user_config = skip_user_config
-      @config_path = config_path
-      @startup_readonly = readonly
-      @startup_diff_mode = diff_mode
-      @startup_quickfix_errorfile = quickfix_errorfile
-      @startup_session_file = session_file
-      @startup_nomodifiable = nomodifiable
-      @startup_follow = follow
+      @startup = StartupState.new(
+        skip_user_config: skip_user_config,
+        config_path: config_path,
+        readonly: readonly,
+        diff_mode: diff_mode,
+        quickfix_errorfile: quickfix_errorfile,
+        session_file: session_file,
+        nomodifiable: nomodifiable,
+        follow: follow,
+        time_path: startup_time_path,
+        time_origin: monotonic_now,
+        timeline: [],
+        open_layout: startup_open_layout,
+        open_count: startup_open_count
+      )
       @restricted_mode = restricted
       @verbose_level = verbose_level.to_i
       @verbose_io = verbose_io
-      @startup_time_path = startup_time_path
-      @startup_time_origin = monotonic_now
-      @startup_timeline = []
-      @startup_open_layout = startup_open_layout
-      @startup_open_count = startup_open_count
+
+      @stream_mixer = StreamMixer.new(editor: @editor, signal_w: @signal_w)
+      @completion = CompletionManager.new(
+        editor: @editor,
+        terminal: @terminal,
+        verbose_logger: method(:verbose_log)
+      )
+      @key_handler = KeyHandler.new(
+        editor: @editor,
+        dispatcher: @dispatcher,
+        keymaps: @keymaps,
+        terminal: @terminal,
+        screen: @screen,
+        completion: @completion,
+        stream_mixer: @stream_mixer
+      )
+
       @editor.restricted_mode = @restricted_mode
-      @editor.stdin_stream_stop_handler = method(:stdin_stream_stop_command)
-      @editor.open_path_handler = method(:open_path_with_large_file_support)
+      @editor.open_path_handler = @stream_mixer.method(:open_path_with_large_file_support)
       @editor.keymap_manager = @keymaps
-      @editor.app_action_handler = method(:handle_editor_app_action)
-      @editor.git_stream_handler = method(:start_git_stream_command)
-      @editor.git_stream_stop_handler = method(:stop_git_stream!)
-      load_command_line_history!
+      @editor.app_action_handler = @key_handler.method(:handle_editor_app_action)
+      @editor.git_stream_handler = @stream_mixer.method(:start_git_stream_command)
+      @editor.git_stream_stop_handler = @stream_mixer.method(:stop_git_stream!)
+      @editor.run_stream_handler = @stream_mixer.method(:start_command_stream!)
+      @editor.shell_executor = ->(command) {
+        result = @terminal.suspend_for_shell(command)
+        @screen.invalidate_cache!
+        result
+      }
+
+      @completion.load_history!
 
       startup_mark("init.start")
       register_builtins!
@@ -79,12 +94,12 @@ module RuVim
 
       if @stdin_stream_mode && startup_paths.empty?
         verbose_log(1, "startup: stdin stream buffer")
-        prepare_stdin_stream_buffer!
+        @stdin_stream_buf = @stream_mixer.prepare_stdin_stream_buffer!(stdin)
       elsif startup_paths.empty?
         verbose_log(1, "startup: intro")
         @editor.show_intro_buffer_if_applicable!
       else
-        verbose_log(1, "startup: open_paths #{startup_paths.inspect} layout=#{@startup_open_layout || :single}")
+        verbose_log(1, "startup: open_paths #{startup_paths.inspect} layout=#{@startup.open_layout || :single}")
         open_startup_paths!(startup_paths)
       end
       startup_mark("buffers.opened")
@@ -95,14 +110,15 @@ module RuVim
       verbose_log(1, "startup: run_startup_actions count=#{Array(startup_actions).length}")
       run_startup_actions!(startup_actions)
       startup_mark("startup_actions.done")
-      start_stdin_stream_reader! if @stream_buffer_id
+      @stream_mixer.start_pending_stdin! if @stdin_stream_buf
       write_startuptime_log!
+      @startup = nil
     end
 
     def run
       @terminal.with_ui do
         loop do
-          @needs_redraw = true if drain_stream_events!
+          @needs_redraw = true if @stream_mixer.drain_events!
           if @needs_redraw
             @screen.render(@editor)
             @needs_redraw = false
@@ -111,36 +127,39 @@ module RuVim
 
           key = @input.read_key(
             wakeup_ios: [@signal_r],
-            timeout: loop_timeout_seconds,
-            esc_timeout: escape_sequence_timeout_seconds
+            timeout: @key_handler.loop_timeout_seconds,
+            esc_timeout: @key_handler.escape_sequence_timeout_seconds
           )
           if key.nil?
-            handle_pending_key_timeout if pending_key_timeout_expired?
-            clear_expired_transient_message_if_any
+            @needs_redraw = true if @key_handler.handle_idle_timeout
             next
           end
 
-          handle_key(key)
+          needs_redraw_from_key = @key_handler.handle(key)
           @needs_redraw = true
+          load_current_ftplugin!
+
+          # Force redraw after suspend_to_shell
+          @needs_redraw = true if needs_redraw_from_key
 
           # Batch insert-mode keystrokes to avoid per-char rendering during paste
           if @editor.mode == :insert && @input.has_pending_input?
-            @paste_batch = true
+            @key_handler.paste_batch = true
             begin
               while @editor.mode == :insert && @input.has_pending_input?
                 batch_key = @input.read_key(timeout: 0, esc_timeout: 0)
                 break unless batch_key
-                handle_key(batch_key)
+                @key_handler.handle(batch_key)
               end
             ensure
-              @paste_batch = false
+              @key_handler.paste_batch = false
             end
           end
         end
       end
     ensure
-      shutdown_background_readers!
-      save_command_line_history!
+      @stream_mixer.shutdown!
+      @completion.save_history!
     end
 
     def run_startup_actions!(actions, log_prefix: "startup")
@@ -152,58 +171,10 @@ module RuVim
 
     private
 
-    def pending_key_timeout_seconds
-      return nil unless @pending_key_deadline
-
-      [@pending_key_deadline - monotonic_now, 0.0].max
-    end
-
-    def loop_timeout_seconds
-      now = monotonic_now
-      timeouts = []
-      if @pending_key_deadline
-        timeouts << [@pending_key_deadline - now, 0.0].max
-      end
-      if (msg_to = @editor.transient_message_timeout_seconds(now:))
-        timeouts << msg_to
-      end
-      timeouts.min
-    end
-
-    def pending_key_timeout_expired?
-      @pending_key_deadline && monotonic_now >= @pending_key_deadline
-    end
-
-    def escape_sequence_timeout_seconds
-      ms = @editor.global_options["ttimeoutlen"].to_i
-      ms = 50 if ms <= 0
-      ms / 1000.0
-    rescue StandardError
-      0.005
-    end
-
-    def arm_pending_key_timeout
-      ms = @editor.global_options["timeoutlen"].to_i
-      ms = 1000 if ms <= 0
-      @pending_key_deadline = monotonic_now + (ms / 1000.0)
-    end
-
-    def clear_pending_key_timeout
-      @pending_key_deadline = nil
-      @pending_ambiguous_invocation = nil
+    def clear_expired_transient_message_if_any
+      @needs_redraw = true if @key_handler.handle_idle_timeout
     end
 
-    def handle_pending_key_timeout
-      inv = @pending_ambiguous_invocation
-      clear_pending_key_timeout
-      if inv
-        @dispatcher.dispatch(@editor, dup_invocation(inv))
-      elsif @pending_keys && !@pending_keys.empty?
-        @editor.echo_error("Unknown key: #{@pending_keys.join}")
-      end
-      @editor.pending_count = nil
-      @pending_keys = []
-    end
 
     def register_builtins!
       cmd = CommandRegistry.instance
@@ -315,16 +286,20 @@ module RuVim
       register_internal_unless(
         cmd,
         "stdin.stream_stop",
-        call: ->(ctx, **) { ctx.editor.stdin_stream_stop_or_cancel! },
-        desc: "Stop stdin follow stream (or cancel pending state)"
+        call: ->(ctx, **) {
+          return if ctx.editor.stream_stop_or_cancel!
+          ctx.editor.invoke_app_action(:normal_ctrl_c)
+        },
+        desc: "Stop stream (or cancel pending state)"
       )
 
-      register_ex_unless(ex, "w", call: :file_write, aliases: %w[write], desc: "Write current buffer", nargs: :maybe_one, bang: true)
+      register_ex_unless(ex, "w", call: :file_write, aliases: %w[write], desc: "Write current buffer", nargs: :any, bang: true)
       register_ex_unless(ex, "q", call: :app_quit, aliases: %w[quit], desc: "Quit", nargs: 0, bang: true)
       register_ex_unless(ex, "qa", call: :app_quit_all, aliases: %w[qall], desc: "Quit all", nargs: 0, bang: true)
       register_ex_unless(ex, "wq", call: :file_write_quit, desc: "Write and quit", nargs: :maybe_one, bang: true)
       register_ex_unless(ex, "wqa", call: :file_write_quit_all, aliases: %w[wqall xa xall], desc: "Write all and quit", nargs: 0, bang: true)
       register_ex_unless(ex, "e", call: :file_edit, aliases: %w[edit], desc: "Edit file / reload", nargs: :maybe_one, bang: true)
+      register_ex_unless(ex, "r", call: :ex_read, aliases: %w[read], desc: "Read file or command output into buffer", nargs: :any)
       register_ex_unless(ex, "help", call: :ex_help, desc: "Show help / topics", nargs: :any)
       register_ex_unless(ex, "command", call: :ex_define_command, desc: "Define user command", nargs: :any, bang: true)
       register_ex_unless(ex, "ruby", call: :ex_ruby, aliases: %w[rb], desc: "Evaluate Ruby", nargs: :any, bang: false)
@@ -382,9 +357,12 @@ module RuVim
       register_internal_unless(cmd, "git.close_buffer", call: :git_close_buffer, desc: "Close git buffer")
       register_internal_unless(cmd, "git.status.open_file", call: :git_status_open_file, desc: "Open file from git status")
       register_internal_unless(cmd, "git.diff.open_file", call: :git_diff_open_file, desc: "Open file from git diff")
+      register_internal_unless(cmd, "git.grep.open_file", call: :git_grep_open_file, desc: "Open file from git grep")
       register_internal_unless(cmd, "git.branch.checkout", call: :git_branch_checkout, desc: "Checkout branch under cursor")
       register_internal_unless(cmd, "git.commit.execute", call: :git_commit_execute, desc: "Execute git commit")
+      register_ex_unless(ex, "run", call: :ex_run, desc: "Run command and show output in buffer", nargs: :any, raw_args: true)
       register_ex_unless(ex, "git", call: :ex_git, desc: "Git subcommand dispatcher", nargs: :any)
+      register_ex_unless(ex, "gh", call: :ex_gh, desc: "GitHub subcommand dispatcher", nargs: :any)
     end
 
     def bind_default_keys!
@@ -487,2739 +465,200 @@ module RuVim
       @keymaps.bind(:normal, "\e", "ui.clear_message")
     end
 
-    def handle_key(key)
-      mode_before = @editor.mode
-      clear_stale_message_before_key(key)
-      @skip_record_for_current_key = false
-      append_dot_change_capture_key(key)
-      if key == :ctrl_z
-        suspend_to_shell
-        track_mode_transition(mode_before)
-        return
-      end
-      if key == :ctrl_c && @editor.mode != :normal
-        handle_ctrl_c
-        track_mode_transition(mode_before)
-        record_macro_key_if_needed(key)
-        return
-      end
-
-      case @editor.mode
-      when :hit_enter
-        handle_hit_enter_key(key)
-      when :insert
-        handle_insert_key(key)
-      when :command_line
-        handle_command_line_key(key)
-      when :visual_char, :visual_line, :visual_block
-        handle_visual_key(key)
-      when :rich
-        handle_rich_key(key)
-      else
-        handle_normal_key(key)
-      end
-      track_mode_transition(mode_before)
-      load_current_ftplugin!
-      record_macro_key_if_needed(key)
-    rescue RuVim::CommandError => e
-      @editor.echo_error(e.message)
-    end
-
-    def clear_stale_message_before_key(key)
-      return if @editor.message.to_s.empty?
-      return if @editor.command_line_active?
-      return if @editor.hit_enter_active?
-
-      # Keep the error visible while the user is still dismissing/cancelling;
-      # otherwise, the next operation replaces the command-line area naturally.
-      return if key == :ctrl_c
-
-      @editor.clear_message
-    end
-
-    def handle_editor_app_action(name, **kwargs)
-      if @editor.rich_mode?
-        case name.to_sym
-        when :normal_operator_start
-          op = (kwargs[:name] || kwargs["name"]).to_sym
-          return if op == :delete || op == :change
-        when :normal_replace_pending_start, :normal_change_repeat
-          return
-        end
-      end
-
-      case name.to_sym
-      when :normal_register_pending_start
-        start_register_pending
-      when :normal_operator_start
-        start_operator_pending((kwargs[:name] || kwargs["name"]).to_sym)
-      when :normal_replace_pending_start
-        start_replace_pending
-      when :normal_find_pending_start
-        start_find_pending((kwargs[:token] || kwargs["token"]).to_s)
-      when :normal_find_repeat
-        repeat_last_find(reverse: !!(kwargs[:reverse] || kwargs["reverse"]))
-      when :normal_change_repeat
-        repeat_last_change
-      when :normal_macro_record_toggle
-        toggle_macro_recording_or_start_pending
-      when :normal_macro_play_pending_start
-        start_macro_play_pending
-      when :normal_mark_pending_start
-        start_mark_pending
-      when :normal_jump_pending_start
-        start_jump_pending(
-          linewise: !!(kwargs[:linewise] || kwargs["linewise"]),
-          repeat_token: (kwargs[:repeat_token] || kwargs["repeat_token"]).to_s
-        )
-      when :follow_toggle
-        ex_follow_toggle
-      else
-        raise RuVim::CommandError, "Unknown app action: #{name}"
-      end
-    end
-
-    def handle_normal_key(key)
-      case
-      when handle_normal_key_pre_dispatch(key)
-      when (token = normalize_key_token(key)).nil?
-      when handle_normal_pending_state(token)
-      when handle_normal_direct_token(token)
-      else
-        @pending_keys ||= []
-        @pending_keys << token
-        resolve_normal_key_sequence
-      end
-    end
-
-    def handle_normal_key_pre_dispatch(key)
-      case
-      when key == :enter && handle_list_window_enter
-      when digit_key?(key) && count_digit_allowed?(key)
-        @editor.pending_count = (@editor.pending_count.to_s + key).to_i
-        @editor.echo(@editor.pending_count.to_s)
-        @pending_keys = []
-      else
-        return false
+    def install_signal_handlers
+      Signal.trap("WINCH") do
+        @screen.invalidate_cache! if @screen.respond_to?(:invalidate_cache!)
+        @needs_redraw = true
+        notify_signal_wakeup
       end
-      true
+    rescue ArgumentError
+      nil
     end
 
-    def handle_normal_pending_state(token)
-      case
-      when @pending_keys && !@pending_keys.empty?
-        @pending_keys << token
-        resolve_normal_key_sequence
-      when @operator_pending
-        handle_operator_pending_key(token)
-      when @register_pending
-        finish_register_pending(token)
-      when @mark_pending
-        finish_mark_pending(token)
-      when @jump_pending
-        finish_jump_pending(token)
-      when @macro_record_pending
-        finish_macro_record_pending(token)
-      when @macro_play_pending
-        finish_macro_play_pending(token)
-      when @replace_pending
-        handle_replace_pending_key(token)
-      when @find_pending
-        finish_find_pending(token)
-      else
-        return false
-      end
-      true
+    def init_config_loader!
+      @config_loader = ConfigLoader.new(
+        command_registry: CommandRegistry.instance,
+        ex_registry: ExCommandRegistry.instance,
+        keymaps: @keymaps,
+        command_host: GlobalCommands.instance
+      )
     end
 
-    def handle_normal_direct_token(token)
-      false
-    end
+    def load_user_config!
+      return if @clean_mode || @restricted_mode
+      return if @startup.skip_user_config
 
-    def resolve_normal_key_sequence
-      match = @keymaps.resolve_with_context(:normal, @pending_keys, editor: @editor)
-      case match.status
-      when :pending, :ambiguous
-        if match.status == :ambiguous && match.invocation
-          inv = dup_invocation(match.invocation)
-          inv.count = @editor.pending_count
-          @pending_ambiguous_invocation = inv
-        else
-          @pending_ambiguous_invocation = nil
-        end
-        arm_pending_key_timeout
-        return
-      when :match
-        clear_pending_key_timeout
-        matched_keys = @pending_keys.dup
-        repeat_count = @editor.pending_count
-        @pending_keys = []
-        invocation = dup_invocation(match.invocation)
-        invocation.count = repeat_count
-        if @editor.rich_mode? && rich_mode_block_command?(invocation.id)
-          @editor.pending_count = nil
-          @pending_keys = []
-          return
-        end
-        @dispatcher.dispatch(@editor, invocation)
-        maybe_record_simple_dot_change(invocation, matched_keys, repeat_count)
+      if @startup.config_path
+        @config_loader.load_file(@startup.config_path)
       else
-        clear_pending_key_timeout
-        @editor.echo_error("Unknown key: #{@pending_keys.join}")
+        @config_loader.load_default!
       end
-      @editor.pending_count = nil
-      @pending_keys = []
+    rescue StandardError => e
+      @editor.echo_error("config error: #{e.message}")
     end
 
-    def handle_insert_key(key)
-      case key
-      when :escape
-        finish_insert_change_group
-        finish_dot_change_capture
-        clear_insert_completion
-        @editor.enter_normal_mode
-        @editor.echo("")
-      when :backspace
-        clear_insert_completion
-        return unless insert_backspace_allowed?
-        insert_backspace_in_insert_mode
-      when :ctrl_n
-        insert_complete(+1)
-      when :ctrl_p
-        insert_complete(-1)
-      when :ctrl_i
-        clear_insert_completion
-        insert_tab_in_insert_mode
-      when :enter
-        clear_insert_completion
-        y, x = @editor.current_buffer.insert_newline(@editor.current_window.cursor_y, @editor.current_window.cursor_x)
-        x = apply_insert_autoindent(y, x, previous_row: y - 1)
-        @editor.current_window.cursor_y = y
-        @editor.current_window.cursor_x = x
-      when :left
-        clear_insert_completion
-        dispatch_insert_cursor_motion("cursor.left")
-      when :right
-        clear_insert_completion
-        dispatch_insert_cursor_motion("cursor.right")
-      when :up
-        clear_insert_completion
-        @editor.current_window.move_up(@editor.current_buffer, 1)
-      when :down
-        clear_insert_completion
-        @editor.current_window.move_down(@editor.current_buffer, 1)
-      when :pageup, :pagedown
-        clear_insert_completion
-        invoke_page_key(key)
-      else
-        return unless key.is_a?(String)
+    def load_current_ftplugin!
+      return if @clean_mode || @restricted_mode
+      return unless @config_loader
 
-        clear_insert_completion
-        @editor.current_buffer.insert_char(@editor.current_window.cursor_y, @editor.current_window.cursor_x, key)
-        @editor.current_window.cursor_x += 1
-        maybe_showmatch_after_insert(key)
-        maybe_dedent_after_insert(key)
-      end
+      @config_loader.load_ftplugin!(@editor, @editor.current_buffer)
+    rescue StandardError => e
+      @editor.echo_error("ftplugin error: #{e.message}")
     end
 
-    def handle_visual_key(key)
-      if arrow_key?(key)
-        invoke_arrow(key)
-        return
-      end
-
-      if paging_key?(key)
-        invoke_page_key(key)
-        return
-      end
-
-      token = normalize_key_token(key)
-      return if token.nil?
-
-      case token
-      when "\e"
-        @register_pending = false
-        @visual_pending = nil
-        @editor.enter_normal_mode
-      when "v"
-        if @editor.mode == :visual_char
-          @editor.enter_normal_mode
-        else
-          @editor.enter_visual(:visual_char)
-        end
-      when "V"
-        if @editor.mode == :visual_line
-          @editor.enter_normal_mode
-        else
-          @editor.enter_visual(:visual_line)
-        end
-      when "<C-v>"
-        if @editor.mode == :visual_block
-          @editor.enter_normal_mode
-        else
-          @editor.enter_visual(:visual_block)
-        end
-      when "y"
-        @dispatcher.dispatch(@editor, CommandInvocation.new(id: "buffer.visual_yank"))
-      when "d"
-        @visual_pending = nil
-        @dispatcher.dispatch(@editor, CommandInvocation.new(id: "buffer.visual_delete"))
-      when "="
-        @dispatcher.dispatch(@editor, CommandInvocation.new(id: "buffer.visual_indent"))
-      when "\""
-        start_register_pending
-      when "i", "a"
-        @visual_pending = token
-      else
-        if @register_pending
-          finish_register_pending(token)
-          return
-        end
-        if @visual_pending
-          if @editor.mode == :visual_block
-            @visual_pending = nil
-            @editor.echo_error("text object in Visual block not supported yet")
-            return
-          end
-          motion = "#{@visual_pending}#{token}"
-          @visual_pending = nil
-          inv = CommandInvocation.new(id: "buffer.visual_select_text_object", kwargs: { motion: motion })
-          @dispatcher.dispatch(@editor, inv)
-        else
-          handle_visual_motion_token(token)
-        end
+    def run_startup_action!(action, log_prefix: "startup")
+      case action[:type]
+      when :ex
+        verbose_log(2, "#{log_prefix} ex: #{action[:value]}")
+        @dispatcher.dispatch_ex(@editor, action[:value].to_s)
+      when :line
+        verbose_log(2, "#{log_prefix} line: #{action[:value]}")
+        move_cursor_to_line(action[:value].to_i)
+      when :line_end
+        verbose_log(2, "#{log_prefix} line_end")
+        move_cursor_to_line(@editor.current_buffer.line_count)
       end
-      @editor.pending_count = nil
-      @pending_keys = []
     end
 
-    def handle_visual_motion_token(token)
-      id = {
-        "h" => "cursor.left",
-        "j" => "cursor.down",
-        "k" => "cursor.up",
-        "l" => "cursor.right",
-        "0" => "cursor.line_start",
-        "$" => "cursor.line_end",
-        "^" => "cursor.first_nonblank",
-        "w" => "cursor.word_forward",
-        "b" => "cursor.word_backward",
-        "e" => "cursor.word_end",
-        "G" => "cursor.buffer_end"
-      }[token]
-
-      if token == "g"
-        @pending_keys ||= []
-        @pending_keys << token
-        arm_pending_key_timeout
-        return
-      end
-
-      if @pending_keys == ["g"] && token == "g"
-        id = "cursor.buffer_start"
-      end
-
-      if id
-        clear_pending_key_timeout
-        count = @editor.pending_count
-        @dispatcher.dispatch(@editor, CommandInvocation.new(id:, count: count))
-      else
-        clear_pending_key_timeout
-        @editor.echo_error("Unknown visual key: #{token}")
-      end
-    ensure
-      @pending_keys = [] unless token == "g"
-    end
+    def verbose_log(level, message)
+      return if @verbose_level < level
+      return unless @verbose_io
 
-    def handle_command_line_key(key)
-      cmd = @editor.command_line
-      case key
-      when :escape
-        clear_command_line_completion
-        cancel_incsearch_preview_if_any
-        @editor.cancel_command_line
-      when :enter
-        clear_command_line_completion
-        line = cmd.text.dup
-        push_command_line_history(cmd.prefix, line)
-        handle_command_line_submit(cmd.prefix, line)
-      when :backspace
-        clear_command_line_completion
-        if cmd.text.empty? && cmd.cursor.zero?
-          cancel_incsearch_preview_if_any
-          @editor.cancel_command_line
-          return
-        end
-        cmd.backspace
-      when :up
-        clear_command_line_completion
-        command_line_history_move(-1)
-      when :down
-        clear_command_line_completion
-        command_line_history_move(1)
-      when :left
-        clear_command_line_completion
-        cmd.move_left
-      when :right
-        clear_command_line_completion
-        cmd.move_right
-      else
-        if key == :ctrl_i
-          command_line_complete
-        elsif key.is_a?(String)
-          clear_command_line_completion
-          @cmdline_history_index = nil
-          cmd.insert(key)
-        end
-      end
-      update_incsearch_preview_if_needed
+      @verbose_io.puts("[ruvim:v#{@verbose_level}] #{message}")
+      @verbose_io.flush if @verbose_io.respond_to?(:flush)
+    rescue StandardError
+      nil
     end
 
-    def handle_list_window_enter
-      buffer = @editor.current_buffer
-      return handle_filter_buffer_enter if buffer.kind == :filter
-      return handle_git_status_enter if buffer.kind == :git_status
-      return handle_git_diff_enter if buffer.kind == :git_diff || buffer.kind == :git_log
-      return handle_git_branch_enter if buffer.kind == :git_branch
-      return false unless buffer.kind == :quickfix || buffer.kind == :location_list
-
-      item_index = @editor.current_window.cursor_y - 2
-      if item_index.negative?
-        @editor.echo_error("No list item on this line")
-        return true
-      end
-
-      source_window_id = buffer.options["ruvim_list_source_window_id"]
-      source_window_id = source_window_id.to_i if source_window_id
-      source_window_id = nil unless source_window_id && @editor.windows.key?(source_window_id)
-
-      item =
-        if buffer.kind == :quickfix
-          @editor.select_quickfix(item_index)
-        else
-          owner_window_id = source_window_id || @editor.current_window_id
-          @editor.select_location_list(item_index, window_id: owner_window_id)
-        end
-
-      unless item
-        @editor.echo_error("#{buffer.kind == :quickfix ? 'quickfix' : 'location list'} item not found")
-        return true
-      end
+    def startup_mark(label)
+      return unless @startup&.time_path
 
-      if source_window_id
-        @editor.current_window_id = source_window_id
-      end
-      @editor.jump_to_location(item)
-      @editor.echo(
-        if buffer.kind == :quickfix
-          "qf #{@editor.quickfix_index.to_i + 1}/#{@editor.quickfix_items.length}"
-        else
-          owner_window_id = source_window_id || @editor.current_window_id
-          list = @editor.location_list(owner_window_id)
-          "ll #{list[:index].to_i + 1}/#{list[:items].length}"
-        end
-      )
-      true
+      @startup.timeline << [label.to_s, monotonic_now]
     end
 
-    def handle_filter_buffer_enter
-      buffer = @editor.current_buffer
-      origins = buffer.options["filter_origins"]
-      return false unless origins
-
-      row = @editor.current_window.cursor_y
-      origin = origins[row]
-      unless origin
-        @editor.echo_error("No filter item on this line")
-        return true
-      end
-
-      target_buffer_id = origin[:buffer_id]
-      target_row = origin[:row]
-      filter_buf_id = buffer.id
+    def write_startuptime_log!
+      return unless @startup&.time_path
 
-      @editor.delete_buffer(filter_buf_id)
-      target_buf = @editor.buffers[target_buffer_id]
-      if target_buf
-        @editor.switch_to_buffer(target_buffer_id) unless @editor.current_buffer.id == target_buffer_id
-        @editor.current_window.cursor_y = [target_row, target_buf.lines.length - 1].min
-        @editor.current_window.cursor_x = 0
+      prev = @startup.time_origin
+      lines = @startup.timeline.map do |label, t|
+        total_ms = ((t - @startup.time_origin) * 1000.0)
+        delta_ms = ((t - prev) * 1000.0)
+        prev = t
+        format("%9.3f %9.3f %s", total_ms, delta_ms, label)
       end
-      true
-    end
-
-    def handle_git_status_enter
-      @dispatcher.dispatch(@editor, CommandInvocation.new(id: "git.status.open_file"))
-      true
-    end
-
-    def handle_git_diff_enter
-      @dispatcher.dispatch(@editor, CommandInvocation.new(id: "git.diff.open_file"))
-      true
-    end
-
-    def handle_git_branch_enter
-      @dispatcher.dispatch(@editor, CommandInvocation.new(id: "git.branch.checkout"))
-      true
-    end
-
-    def arrow_key?(key)
-      %i[left right up down].include?(key)
-    end
-
-    def paging_key?(key)
-      %i[pageup pagedown].include?(key)
-    end
-
-    def invoke_arrow(key)
-      id = {
-        left: "cursor.left",
-        right: "cursor.right",
-        up: "cursor.up",
-        down: "cursor.down"
-      }.fetch(key)
-      inv = CommandInvocation.new(id:, count: @editor.pending_count)
-      @dispatcher.dispatch(@editor, inv)
-      @editor.pending_count = nil
-      @pending_keys = []
+      File.write(@startup.time_path, lines.join("\n") + "\n")
+    rescue StandardError => e
+      verbose_log(1, "startuptime write error: #{e.message}")
     end
 
-    def invoke_page_key(key)
-      id = (key == :pageup ? "cursor.page_up" : "cursor.page_down")
-      inv = CommandInvocation.new(
-        id: id,
-        count: @editor.pending_count,
-        kwargs: { page_lines: current_page_step_lines }
-      )
-      @dispatcher.dispatch(@editor, inv)
-      @editor.pending_count = nil
-      @pending_keys = []
+    def monotonic_now
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    rescue StandardError
+      Time.now.to_f
     end
 
-    def digit_key?(key)
-      key.is_a?(String) && key.match?(/\A\d\z/)
+    def apply_startup_buffer_flags!
+      apply_startup_readonly! if @startup.readonly
+      apply_startup_nomodifiable! if @startup.nomodifiable
+      apply_startup_follow! if @startup.follow
     end
 
-    def count_digit_allowed?(key)
-      return false unless @editor.mode == :normal
-      return true unless @editor.pending_count.nil?
+    def apply_startup_readonly!
+      buf = @editor.current_buffer
+      return unless buf&.file_buffer?
 
-      key != "0"
+      buf.readonly = true
+      @editor.echo("readonly: #{buf.display_name}")
     end
 
-    def normalize_key_token(key)
-      case key
-      when String then key
-      when :escape then "\e"
-      when :ctrl_r then "<C-r>"
-      when :ctrl_d then "<C-d>"
-      when :ctrl_u then "<C-u>"
-      when :ctrl_f then "<C-f>"
-      when :ctrl_b then "<C-b>"
-      when :ctrl_e then "<C-e>"
-      when :ctrl_y then "<C-y>"
-      when :ctrl_v then "<C-v>"
-      when :ctrl_i then "<C-i>"
-      when :ctrl_o then "<C-o>"
-      when :ctrl_w then "<C-w>"
-      when :ctrl_l then "<C-l>"
-      when :ctrl_c then "<C-c>"
-      when :ctrl_g then "<C-g>"
-      when :left then "<Left>"
-      when :right then "<Right>"
-      when :up then "<Up>"
-      when :down then "<Down>"
-      when :home then "<Home>"
-      when :end then "<End>"
-      when :pageup then "<PageUp>"
-      when :pagedown then "<PageDown>"
-      when :shift_up then "<S-Up>"
-      when :shift_down then "<S-Down>"
-      when :shift_left then "<S-Left>"
-      when :shift_right then "<S-Right>"
-      else nil
-      end
-    end
+    def apply_startup_follow!
+      buf = @editor.current_buffer
+      return unless buf&.file_buffer?
+      return if @stream_mixer.follow_active?(buf)
 
-    def dup_invocation(inv)
-      CommandInvocation.new(
-        id: inv.id,
-        argv: inv.argv.dup,
-        kwargs: inv.kwargs.dup,
-        count: inv.count,
-        bang: inv.bang,
-        raw_keys: inv.raw_keys&.dup
-      )
+      win = @editor.current_window
+      win.cursor_y = buf.line_count - 1
+      win.clamp_to_buffer(buf)
+      @stream_mixer.start_follow!(buf)
     end
 
-    # Rich mode: delegates to normal mode key handling but blocks mutating operations.
-    RICH_MODE_BLOCKED_COMMANDS = %w[
-      mode.insert mode.append mode.append_line_end mode.insert_nonblank
-      mode.open_below mode.open_above
-      buffer.delete_char buffer.delete_line buffer.delete_motion
-      buffer.change_motion buffer.change_line
-      buffer.paste_after buffer.paste_before
-      buffer.replace_char
-      buffer.visual_delete
-    ].freeze
+    def apply_startup_nomodifiable!
+      buf = @editor.current_buffer
+      return unless buf&.file_buffer?
 
-    def handle_hit_enter_key(key)
-      token = normalize_key_token(key)
-      case token
-      when ":"
-        @editor.exit_hit_enter_mode
-        @editor.enter_command_line_mode(":")
-      when "/", "?"
-        @editor.exit_hit_enter_mode
-        @editor.enter_command_line_mode(token)
-      else
-        @editor.exit_hit_enter_mode
-      end
+      buf.modifiable = false
+      buf.readonly = true
+      @editor.echo("nomodifiable: #{buf.display_name}")
     end
 
-    def handle_rich_key(key)
-      token = normalize_key_token(key)
-      if token == "\e"
-        RuVim::RichView.close!(@editor)
-        return
+    def apply_startup_compat_mode_messages!
+      if @startup.diff_mode
+        verbose_log(1, "startup: -d requested (diff mode placeholder)")
+        @editor.echo("diff mode (-d) is not implemented yet")
       end
 
-      handle_normal_key(key)
-    end
-
-    def rich_mode_block_command?(command_id)
-      RICH_MODE_BLOCKED_COMMANDS.include?(command_id.to_s)
-    end
-
-    def handle_ctrl_c
-      case @editor.mode
-      when :hit_enter
-        @editor.exit_hit_enter_mode
-      when :insert
-        finish_insert_change_group
-        finish_dot_change_capture
-        clear_insert_completion
-        clear_pending_key_timeout
-        @editor.enter_normal_mode
-        @editor.echo("")
-      when :command_line
-        clear_pending_key_timeout
-        cancel_incsearch_preview_if_any
-        @editor.cancel_command_line
-      when :visual_char, :visual_line, :visual_block
-        @visual_pending = nil
-        @register_pending = false
-        @mark_pending = false
-        @jump_pending = nil
-        clear_pending_key_timeout
-        @editor.enter_normal_mode
-      when :rich
-        clear_pending_key_timeout
-        @editor.pending_count = nil
-        @pending_keys = []
-        @operator_pending = nil
-        @replace_pending = nil
-        @register_pending = false
-        @mark_pending = false
-        @jump_pending = nil
-        @macro_record_pending = false
-        @macro_play_pending = false
-        RuVim::RichView.close!(@editor)
-      else
-        clear_pending_key_timeout
-        @editor.pending_count = nil
-        @pending_keys = []
-        @operator_pending = nil
-        @replace_pending = nil
-        @register_pending = false
-        @mark_pending = false
-        @jump_pending = nil
-        @macro_record_pending = false
-        @macro_play_pending = false
-        @editor.clear_message
+      if @startup.quickfix_errorfile
+        verbose_log(1, "startup: -q #{@startup.quickfix_errorfile} requested (quickfix placeholder)")
+        @editor.echo("quickfix startup (-q #{@startup.quickfix_errorfile}) is not implemented yet")
       end
-    end
 
-    def handle_normal_ctrl_c
-      clear_pending_key_timeout
-      @editor.pending_count = nil
-      @pending_keys = []
-      @operator_pending = nil
-      @replace_pending = nil
-      @register_pending = false
-      @mark_pending = false
-      @jump_pending = nil
-      @macro_record_pending = false
-      @macro_play_pending = false
-      buf = @editor.current_buffer
-      if buf && @follow_watchers[buf.id]
-        stop_follow!(buf)
-      else
-        @editor.clear_message
+      if @startup.session_file
+        verbose_log(1, "startup: -S #{@startup.session_file} requested (session placeholder)")
+        @editor.echo("session startup (-S #{@startup.session_file}) is not implemented yet")
       end
     end
 
-    def suspend_to_shell
-      @terminal.suspend_for_tstp
-      @screen.invalidate_cache! if @screen.respond_to?(:invalidate_cache!)
-      @needs_redraw = true
-    rescue StandardError => e
-      @editor.echo_error("suspend failed: #{e.message}")
-    end
-
-    def finish_insert_change_group
-      @editor.current_buffer.end_change_group
-    end
-
-    def handle_command_line_submit(prefix, line)
-      clear_incsearch_preview_state(apply: false) if %w[/ ?].include?(prefix)
-      case prefix
-      when ":"
-        verbose_log(2, "ex: #{line}")
-        @dispatcher.dispatch_ex(@editor, line)
-      when "/"
-        verbose_log(2, "search(/): #{line}")
-        submit_search(line, direction: :forward)
-      when "?"
-        verbose_log(2, "search(?): #{line}")
-        submit_search(line, direction: :backward)
-      else
-        @editor.echo_error("Unknown command-line prefix: #{prefix}")
-        @editor.enter_normal_mode
-      end
-      @cmdline_history_index = nil
-    end
+    def open_startup_paths!(paths)
+      list = Array(paths).compact
+      return if list.empty?
 
-    def start_operator_pending(name)
-      @operator_pending = { name:, count: @editor.pending_count }
-      @editor.pending_count = nil
-      @pending_keys = []
-      @editor.echo(name == :delete ? "d" : name.to_s)
-    end
+      evict_bootstrap_buffer!
+      @editor.set_arglist(list)
 
-    def start_register_pending
-      @register_pending = true
-      @editor.echo('"')
-    end
+      first, *rest = list
+      @editor.open_path(first)
+      apply_startup_buffer_flags!
 
-    def finish_register_pending(token)
-      @register_pending = false
-      if token.is_a?(String) && token.length == 1
-        @editor.set_active_register(token)
-        @editor.echo(%("#{token}))
+      case @startup.open_layout
+      when :horizontal
+        first_win_id = @editor.current_window_id
+        rest.each { |p| open_path_in_split!(p, layout: :horizontal) }
+        @editor.focus_window(first_win_id)
+      when :vertical
+        first_win_id = @editor.current_window_id
+        rest.each { |p| open_path_in_split!(p, layout: :vertical) }
+        @editor.focus_window(first_win_id)
+      when :tab
+        rest.each { |p| open_path_in_tab!(p) }
+        @editor.tabnext(-(@editor.tabpage_count - 1))
       else
-        @editor.echo_error("Invalid register")
-      end
-    end
-
-    def start_mark_pending
-      @mark_pending = true
-      @editor.echo("m")
-    end
-
-    def finish_mark_pending(token)
-      @mark_pending = false
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-      unless token.is_a?(String) && token.match?(/\A[A-Za-z]\z/)
-        @editor.echo_error("Invalid mark")
-        return
+        rest.each do |p|
+          buf = @editor.add_buffer_from_file(p)
+          @stream_mixer.start_follow!(buf) if @startup.follow
+        end
       end
-
-      inv = CommandInvocation.new(id: "mark.set", kwargs: { mark: token })
-      @dispatcher.dispatch(@editor, inv)
-    end
-
-    def start_jump_pending(linewise:, repeat_token:)
-      @jump_pending = { linewise: linewise, repeat_token: repeat_token }
-      @editor.echo(repeat_token)
     end
 
-    def finish_jump_pending(token)
-      pending = @jump_pending
-      @jump_pending = nil
-      return unless pending
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-
-      if token == pending[:repeat_token]
-        inv = CommandInvocation.new(id: "jump.older", kwargs: { linewise: pending[:linewise] })
-        @dispatcher.dispatch(@editor, inv)
-        return
-      end
-
-      unless token.is_a?(String) && token.match?(/\A[A-Za-z]\z/)
-        @editor.echo_error("Invalid mark")
-        return
+    def evict_bootstrap_buffer!
+      bid = @editor.buffer_ids.find do |id|
+        b = @editor.buffers[id]
+        b.path.nil? && !b.modified? && b.line_count <= 1 && b.kind == :file
       end
+      return unless bid
 
-      inv = CommandInvocation.new(id: "mark.jump", kwargs: { mark: token, linewise: pending[:linewise] })
-      @dispatcher.dispatch(@editor, inv)
-    end
-
-    def start_macro_record_pending
-      @macro_record_pending = true
-      @editor.echo("q")
+      @editor.buffers.delete(bid)
+      @editor.instance_variable_set(:@next_buffer_id, 1)
     end
 
-    def toggle_macro_recording_or_start_pending
-      if @editor.macro_recording?
-        stop_macro_recording
-      else
-        start_macro_record_pending
-      end
-    end
-
-    def finish_macro_record_pending(token)
-      @macro_record_pending = false
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-      unless token.is_a?(String) && token.match?(/\A[A-Za-z0-9]\z/)
-        @editor.echo_error("Invalid macro register")
-        return
-      end
-
-      unless @editor.start_macro_recording(token)
-        @editor.echo("Failed to start recording")
-        return
-      end
-      @skip_record_for_current_key = true
-      @editor.echo("recording @#{token}")
-    end
-
-    def stop_macro_recording
-      reg = @editor.macro_recording_name
-      @editor.stop_macro_recording
-      @editor.echo("recording @#{reg} stopped")
-    end
-
-    def start_macro_play_pending
-      @macro_play_pending = true
-      @editor.echo("@")
-    end
-
-    def finish_macro_play_pending(token)
-      @macro_play_pending = false
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-      name =
-        if token == "@"
-          @last_macro_name
-        elsif token.is_a?(String) && token.match?(/\A[A-Za-z0-9]\z/)
-          token
-        end
-      unless name
-        @editor.echo_error("Invalid macro register")
-        return
-      end
-
-      count = @editor.pending_count
-      @editor.pending_count = nil
-      play_macro(name, count:)
-    end
-
-    def play_macro(name, count:)
-      reg = name.to_s.downcase
-      keys = @editor.macro_keys(reg)
-      if keys.nil? || keys.empty?
-        @editor.echo("Macro empty: #{reg}")
-        return
-      end
-
-      @macro_play_stack ||= []
-      if @macro_play_stack.include?(reg) || @macro_play_stack.length >= 20
-        @editor.echo("Macro recursion blocked: #{reg}")
-        return
-      end
-
-      @last_macro_name = reg
-      @macro_play_stack << reg
-      @suspend_macro_recording_depth = (@suspend_macro_recording_depth || 0) + 1
-      [count.to_i, 1].max.times do
-        keys.each { |k| handle_key(dup_macro_runtime_key(k)) }
-      end
-      @editor.echo("@#{reg}")
-    ensure
-      @suspend_macro_recording_depth = [(@suspend_macro_recording_depth || 1) - 1, 0].max
-      @macro_play_stack.pop if @macro_play_stack && !@macro_play_stack.empty?
-    end
-
-    def record_macro_key_if_needed(key)
-      return if @skip_record_for_current_key
-      return unless @editor.macro_recording?
-      return if (@suspend_macro_recording_depth || 0).positive?
-      return if (@dot_replay_depth || 0).positive?
-
-      @editor.record_macro_key(key)
-    end
-
-    def dup_macro_runtime_key(key)
-      case key
-      when String
-        key.dup
-      when Array
-        key.map { |v| v.is_a?(String) ? v.dup : v }
-      else
-        key
-      end
-    end
-
-    def handle_operator_pending_key(token)
-      op = @operator_pending
-      if %w[i a g].include?(token) && !op[:motion_prefix]
-        @operator_pending[:motion_prefix] = token
-        @editor.echo("#{op[:name].to_s[0]}#{token}")
-        return
-      end
-
-      motion = [op[:motion_prefix], token].compact.join
-      @operator_pending = nil
-
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-
-      if op[:name] == :delete && motion == "d"
-        inv = CommandInvocation.new(id: "buffer.delete_line", count: op[:count])
-        @dispatcher.dispatch(@editor, inv)
-        record_last_change_keys(count_prefixed_keys(op[:count], ["d", "d"]))
-        return
-      end
-
-      if op[:name] == :delete
-        inv = CommandInvocation.new(id: "buffer.delete_motion", count: op[:count], kwargs: { motion: motion })
-        @dispatcher.dispatch(@editor, inv)
-        record_last_change_keys(count_prefixed_keys(op[:count], ["d", *motion.each_char.to_a]))
-        return
-      end
-
-      if op[:name] == :yank && motion == "y"
-        inv = CommandInvocation.new(id: "buffer.yank_line", count: op[:count])
-        @dispatcher.dispatch(@editor, inv)
-        return
-      end
-
-      if op[:name] == :yank
-        inv = CommandInvocation.new(id: "buffer.yank_motion", count: op[:count], kwargs: { motion: motion })
-        @dispatcher.dispatch(@editor, inv)
-        return
-      end
-
-      if op[:name] == :indent && motion == "="
-        inv = CommandInvocation.new(id: "buffer.indent_lines", count: op[:count])
-        @dispatcher.dispatch(@editor, inv)
-        return
-      end
-
-      if op[:name] == :indent
-        inv = CommandInvocation.new(id: "buffer.indent_motion", count: op[:count], kwargs: { motion: motion })
-        @dispatcher.dispatch(@editor, inv)
-        return
-      end
-
-      if op[:name] == :change && motion == "c"
-        inv = CommandInvocation.new(id: "buffer.change_line", count: op[:count])
-        @dispatcher.dispatch(@editor, inv)
-        begin_dot_change_capture(count_prefixed_keys(op[:count], ["c", "c"])) if @editor.mode == :insert
-        return
-      end
-
-      if op[:name] == :change
-        inv = CommandInvocation.new(id: "buffer.change_motion", count: op[:count], kwargs: { motion: motion })
-        @dispatcher.dispatch(@editor, inv)
-        begin_dot_change_capture(count_prefixed_keys(op[:count], ["c", *motion.each_char.to_a])) if @editor.mode == :insert
-        return
-      end
-
-      @editor.echo_error("Unknown operator")
-    end
-
-    def start_replace_pending
-      @replace_pending = { count: @editor.pending_count }
-      @editor.pending_count = nil
-      @pending_keys = []
-      @editor.echo("r")
-    end
-
-    def handle_replace_pending_key(token)
-      pending = @replace_pending
-      @replace_pending = nil
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-
-      if token.is_a?(String) && !token.empty?
-        inv = CommandInvocation.new(id: "buffer.replace_char", argv: [token], count: pending[:count])
-        @dispatcher.dispatch(@editor, inv)
-        record_last_change_keys(count_prefixed_keys(pending[:count], ["r", token]))
-      else
-        @editor.echo("r expects one character")
-      end
-    end
-
-    def repeat_last_change
-      keys = @last_change_keys
-      if keys.nil? || keys.empty?
-        @editor.echo("No previous change")
-        return
-      end
-
-      @dot_replay_depth = (@dot_replay_depth || 0) + 1
-      keys.each { |k| handle_key(dup_macro_runtime_key(k)) }
-      @editor.echo(".")
-    ensure
-      @dot_replay_depth = [(@dot_replay_depth || 1) - 1, 0].max
-    end
-
-    def maybe_record_simple_dot_change(invocation, matched_keys, count)
-      return if (@dot_replay_depth || 0).positive?
-
-      case invocation.id
-      when "buffer.delete_char", "buffer.delete_motion", "buffer.join_lines", "buffer.swapcase_char", "buffer.paste_after", "buffer.paste_before"
-        record_last_change_keys(count_prefixed_keys(count, matched_keys))
-      when "mode.insert", "mode.append", "mode.append_line_end", "mode.insert_nonblank", "mode.open_below", "mode.open_above", "buffer.substitute_char", "buffer.change_motion", "buffer.change_line"
-        begin_dot_change_capture(count_prefixed_keys(count, matched_keys)) if @editor.mode == :insert
-      end
-    end
-
-    def begin_dot_change_capture(prefix_keys)
-      return if (@dot_replay_depth || 0).positive?
-
-      @dot_change_capture_keys = Array(prefix_keys).map { |k| dup_macro_runtime_key(k) }
-      @dot_change_capture_active = true
-    end
-
-    def append_dot_change_capture_key(key)
-      return unless @dot_change_capture_active
-      return if (@dot_replay_depth || 0).positive?
-
-      @dot_change_capture_keys ||= []
-      @dot_change_capture_keys << dup_macro_runtime_key(key)
-    end
-
-    def finish_dot_change_capture
-      return unless @dot_change_capture_active
-
-      keys = Array(@dot_change_capture_keys)
-      @dot_change_capture_active = false
-      @dot_change_capture_keys = nil
-      record_last_change_keys(keys)
-    end
-
-    def record_last_change_keys(keys)
-      return if (@dot_replay_depth || 0).positive?
-
-      @last_change_keys = Array(keys).map { |k| dup_macro_runtime_key(k) }
-    end
-
-    def count_prefixed_keys(count, keys)
-      c = count.to_i
-      prefix = c > 1 ? c.to_s.each_char.to_a : []
-      prefix + Array(keys)
-    end
-
-    def start_find_pending(token)
-      @find_pending = {
-        direction: (token == "f" || token == "t") ? :forward : :backward,
-        till: (token == "t" || token == "T"),
-        count: @editor.pending_count
-      }
-      @editor.pending_count = nil
-      @pending_keys = []
-      @editor.echo(token)
-    end
-
-    def finish_find_pending(token)
-      pending = @find_pending
-      @find_pending = nil
-      if token == "\e"
-        @editor.clear_message
-        return
-      end
-      unless token.is_a?(String) && !token.empty?
-        @editor.echo("find expects one character")
-        return
-      end
-
-      moved = perform_find_on_line(
-        char: token,
-        direction: pending[:direction],
-        till: pending[:till],
-        count: pending[:count]
-      )
-      if moved
-        @editor.set_last_find(char: token, direction: pending[:direction], till: pending[:till])
-      else
-        @editor.echo("Char not found: #{token}")
-      end
-    end
-
-    def repeat_last_find(reverse:)
-      last = @editor.last_find
-      unless last
-        @editor.echo("No previous f/t")
-        return
-      end
-
-      direction =
-        if reverse
-          last[:direction] == :forward ? :backward : :forward
-        else
-          last[:direction]
-        end
-      count = @editor.pending_count
-      @editor.pending_count = nil
-      @pending_keys = []
-      moved = perform_find_on_line(char: last[:char], direction:, till: last[:till], count:)
-      @editor.echo("Char not found: #{last[:char]}") unless moved
-    end
-
-    def perform_find_on_line(char:, direction:, till:, count:)
-      win = @editor.current_window
-      buf = @editor.current_buffer
-      line = buf.line_at(win.cursor_y)
-      pos = win.cursor_x
-      target = nil
-
-      [count.to_i, 1].max.times do
-        idx =
-          if direction == :forward
-            line.index(char, pos + 1)
-          else
-            rindex_from(line, char, pos - 1)
-          end
-        return false if idx.nil?
-
-        target = idx
-        pos = idx
-      end
-
-      if till
-        target =
-          if direction == :forward
-            RuVim::TextMetrics.previous_grapheme_char_index(line, target)
-          else
-            RuVim::TextMetrics.next_grapheme_char_index(line, target)
-          end
-      end
-
-      win.cursor_x = target
-      win.clamp_to_buffer(buf)
-      true
-    end
-
-    def rindex_from(line, char, pos)
-      return nil if pos.negative?
-
-      line.rindex(char, pos)
-    end
-
-    def submit_search(line, direction:)
-      inv = CommandInvocation.new(id: "__search_submit__", argv: [line], kwargs: { pattern: line, direction: direction })
-      ctx = Context.new(editor: @editor, invocation: inv)
-      GlobalCommands.instance.submit_search(ctx, pattern: line, direction: direction)
-      @editor.enter_normal_mode
-    rescue StandardError => e
-      @editor.echo_error("Error: #{e.message}")
-      @editor.enter_normal_mode
-    end
-
-    def push_command_line_history(prefix, line)
-      text = line.to_s
-      return if text.empty?
-
-      hist = @cmdline_history[prefix]
-      hist.delete(text)
-      hist << text
-      hist.shift while hist.length > 100
-      @cmdline_history_index = nil
-    end
-
-    def load_command_line_history!
-      path = command_line_history_file_path
-      return unless path
-      return unless File.file?(path)
-
-      raw = File.read(path)
-      data = JSON.parse(raw)
-      return unless data.is_a?(Hash)
-
-      loaded = Hash.new { |h, k| h[k] = [] }
-      data.each do |prefix, items|
-        key = prefix.to_s
-        next unless [":", "/", "?"].include?(key)
-        next unless items.is_a?(Array)
-
-        hist = loaded[key]
-        items.each do |item|
-          text = item.to_s
-          next if text.empty?
-
-          hist.delete(text)
-          hist << text
-        end
-        hist.shift while hist.length > 100
-      end
-      @cmdline_history = loaded
-    rescue StandardError => e
-      verbose_log(1, "history load error: #{e.message}")
-    end
-
-    def save_command_line_history!
-      path = command_line_history_file_path
-      return unless path
-
-      payload = {
-        ":" => Array(@cmdline_history[":"]).map(&:to_s).last(100),
-        "/" => Array(@cmdline_history["/"]).map(&:to_s).last(100),
-        "?" => Array(@cmdline_history["?"]).map(&:to_s).last(100)
-      }
-
-      FileUtils.mkdir_p(File.dirname(path))
-      tmp = "#{path}.tmp"
-      File.write(tmp, JSON.pretty_generate(payload) + "\n")
-      File.rename(tmp, path)
-    rescue StandardError => e
-      verbose_log(1, "history save error: #{e.message}")
-    end
-
-    def command_line_history_file_path
-      xdg_state_home = ENV["XDG_STATE_HOME"].to_s
-      if !xdg_state_home.empty?
-        return File.join(xdg_state_home, "ruvim", "history.json")
-      end
-
-      home = ENV["HOME"].to_s
-      return nil if home.empty?
-
-      File.join(home, ".ruvim", "history.json")
-    end
-
-    def command_line_history_move(delta)
-      cmd = @editor.command_line
-      hist = @cmdline_history[cmd.prefix]
-      return if hist.empty?
-
-      @cmdline_history_index =
-        if @cmdline_history_index.nil?
-          delta.negative? ? hist.length - 1 : hist.length
-        else
-          @cmdline_history_index + delta
-        end
-
-      @cmdline_history_index = [[@cmdline_history_index, 0].max, hist.length].min
-      if @cmdline_history_index == hist.length
-        cmd.replace_text("")
-      else
-        cmd.replace_text(hist[@cmdline_history_index])
-      end
-      update_incsearch_preview_if_needed
-    end
-
-    def command_line_complete
-      cmd = @editor.command_line
-      return unless cmd.prefix == ":"
-
-      ctx = ex_completion_context(cmd)
-      return unless ctx
-
-      matches = reusable_command_line_completion_matches(cmd, ctx) || ex_completion_candidates(ctx)
-      case matches.length
-      when 0
-        clear_command_line_completion
-        @editor.echo("No completion")
-      when 1
-        clear_command_line_completion
-        cmd.replace_span(ctx[:token_start], ctx[:token_end], matches.first)
-      else
-        apply_wildmode_completion(cmd, ctx, matches)
-      end
-      update_incsearch_preview_if_needed
-    end
-
-    def reusable_command_line_completion_matches(cmd, ctx)
-      state = @cmdline_completion
-      return nil unless state
-      return nil unless state[:prefix] == cmd.prefix
-      return nil unless state[:kind] == ctx[:kind]
-      return nil unless state[:command] == ctx[:command]
-      return nil unless state[:arg_index] == ctx[:arg_index]
-      return nil unless state[:token_start] == ctx[:token_start]
-
-      before_text = cmd.text[0...ctx[:token_start]].to_s
-      after_text = cmd.text[ctx[:token_end]..].to_s
-      return nil unless state[:before_text] == before_text
-      return nil unless state[:after_text] == after_text
-
-      matches = Array(state[:matches]).map(&:to_s)
-      return nil if matches.empty?
-
-      current_token = cmd.text[ctx[:token_start]...ctx[:token_end]].to_s
-      return nil unless current_token.empty? || matches.include?(current_token) || common_prefix(matches).start_with?(current_token) || current_token.start_with?(common_prefix(matches))
-
-      matches
-    end
-
-    def clear_command_line_completion
-      @cmdline_completion = nil
-    end
-
-    def apply_wildmode_completion(cmd, ctx, matches)
-      mode_steps = wildmode_steps
-      mode_steps = [:full] if mode_steps.empty?
-      state = @cmdline_completion
-      before_text = cmd.text[0...ctx[:token_start]].to_s
-      after_text = cmd.text[ctx[:token_end]..].to_s
-      same = state &&
-             state[:prefix] == cmd.prefix &&
-             state[:kind] == ctx[:kind] &&
-             state[:command] == ctx[:command] &&
-             state[:arg_index] == ctx[:arg_index] &&
-             state[:token_start] == ctx[:token_start] &&
-             state[:before_text] == before_text &&
-             state[:after_text] == after_text &&
-             state[:matches] == matches
-      unless same
-        state = {
-          prefix: cmd.prefix,
-          kind: ctx[:kind],
-          command: ctx[:command],
-          arg_index: ctx[:arg_index],
-          token_start: ctx[:token_start],
-          before_text: before_text,
-          after_text: after_text,
-          matches: matches.dup,
-          step_index: -1,
-          full_index: nil
-        }
-      end
-
-      state[:step_index] += 1
-      step = mode_steps[state[:step_index] % mode_steps.length]
-      case step
-      when :longest
-        pref = common_prefix(matches)
-        cmd.replace_span(ctx[:token_start], ctx[:token_end], pref) if pref.length > ctx[:prefix].length
-      when :list
-        show_command_line_completion_menu(matches, selected: state[:full_index], force: true)
-      when :full
-        state[:full_index] = state[:full_index] ? (state[:full_index] + 1) % matches.length : 0
-        cmd.replace_span(ctx[:token_start], ctx[:token_end], matches[state[:full_index]])
-        show_command_line_completion_menu(matches, selected: state[:full_index], force: false)
-      else
-        pref = common_prefix(matches)
-        cmd.replace_span(ctx[:token_start], ctx[:token_end], pref) if pref.length > ctx[:prefix].length
-      end
-
-      @cmdline_completion = state
-    end
-
-    def wildmode_steps
-      raw = @editor.effective_option("wildmode").to_s
-      return [:full] if raw.empty?
-
-      raw.split(",").flat_map do |tok|
-        tok.to_s.split(":").map do |part|
-          case part.strip.downcase
-          when "longest" then :longest
-          when "list" then :list
-          when "full" then :full
-          end
-        end
-      end.compact
-    end
-
-    def show_command_line_completion_menu(matches, selected:, force:)
-      return unless force || @editor.effective_option("wildmenu")
-
-      items = matches.each_with_index.map do |m, i|
-        idx = i
-        idx == selected ? "[#{m}]" : m
-      end
-      @editor.echo(compose_command_line_completion_menu(items))
-    end
-
-    def compose_command_line_completion_menu(items)
-      parts = Array(items).map(&:to_s)
-      return "" if parts.empty?
-
-      width = command_line_completion_menu_width
-      width = [width.to_i, 1].max
-      out = +""
-      shown = 0
-
-      parts.each_with_index do |item, idx|
-        token = shown.zero? ? item : " #{item}"
-        if out.empty? && token.length > width
-          out = token[0, width]
-          shown = 1
-          break
-        end
-        break if out.length + token.length > width
-
-        out << token
-        shown = idx + 1
-      end
-
-      if shown < parts.length
-        ellipsis = (out.empty? ? "..." : " ...")
-        if out.length + ellipsis.length <= width
-          out << ellipsis
-        elsif width >= 3
-          out = out[0, width - 3] + "..."
-        else
-          out = "." * width
-        end
-      end
-
-      out
-    end
-
-    def command_line_completion_menu_width
-      return 80 unless defined?(@terminal) && @terminal && @terminal.respond_to?(:winsize)
-
-      _rows, cols = @terminal.winsize
-      [cols.to_i, 1].max
-    rescue StandardError
-      80
-    end
-
-    def common_prefix(strings)
-      return "" if strings.empty?
-
-      prefix = strings.first.dup
-      strings[1..]&.each do |s|
-        while !prefix.empty? && !s.start_with?(prefix)
-          prefix = prefix[0...-1]
-        end
-      end
-      prefix
-    end
-
-    def clear_insert_completion
-      @insert_completion = nil
-    end
-
-    def insert_tab_in_insert_mode
-      buf = @editor.current_buffer
-      win = @editor.current_window
-      if @editor.effective_option("expandtab", window: win, buffer: buf)
-        width = @editor.effective_option("softtabstop", window: win, buffer: buf).to_i
-        width = @editor.effective_option("tabstop", window: win, buffer: buf).to_i if width <= 0
-        width = 2 if width <= 0
-        line = buf.line_at(win.cursor_y)
-        current_col = RuVim::TextMetrics.screen_col_for_char_index(line, win.cursor_x, tabstop: effective_tabstop(win, buf))
-        spaces = width - (current_col % width)
-        spaces = width if spaces <= 0
-        _y, x = buf.insert_text(win.cursor_y, win.cursor_x, " " * spaces)
-        win.cursor_x = x
-      else
-        buf.insert_char(win.cursor_y, win.cursor_x, "\t")
-        win.cursor_x += 1
-      end
-    end
-
-    def apply_insert_autoindent(row, x, previous_row:)
-      return x if @paste_batch
-      buf = @editor.current_buffer
-      win = @editor.current_window
-      return x unless @editor.effective_option("autoindent", window: win, buffer: buf)
-      return x if previous_row.negative?
-
-      prev = buf.line_at(previous_row)
-      indent = prev[/\A[ \t]*/].to_s
-      if @editor.effective_option("smartindent", window: win, buffer: buf)
-        trimmed = prev.rstrip
-        needs_indent = trimmed.end_with?("{", "[", "(")
-        if !needs_indent
-          needs_indent = buf.lang_module.indent_trigger?(trimmed)
-        end
-        if needs_indent
-          sw = @editor.effective_option("shiftwidth", window: win, buffer: buf).to_i
-          sw = effective_tabstop(win, buf) if sw <= 0
-          sw = 2 if sw <= 0
-          indent += " " * sw
-        end
-      end
-      return x if indent.empty?
-
-      _y, new_x = buf.insert_text(row, x, indent)
-      new_x
-    end
-
-    def maybe_showmatch_after_insert(key)
-      return unless [")", "]", "}"].include?(key)
-      return unless @editor.effective_option("showmatch")
-
-      mt = @editor.effective_option("matchtime").to_i
-      mt = 5 if mt <= 0
-      @editor.echo_temporary("match", duration_seconds: mt * 0.1)
-    end
-
-    def maybe_dedent_after_insert(key)
-      return unless @editor.effective_option("smartindent", window: @editor.current_window, buffer: @editor.current_buffer)
-
-      buf = @editor.current_buffer
-      lang_mod = buf.lang_module
-
-      pattern = lang_mod.dedent_trigger(key)
-      return unless pattern
-
-      row = @editor.current_window.cursor_y
-      line = buf.line_at(row)
-      m = line.match(pattern)
-      return unless m
-
-      sw = @editor.effective_option("shiftwidth", buffer: buf).to_i
-      sw = 2 if sw <= 0
-      target_indent = lang_mod.calculate_indent(buf.lines, row, sw)
-      return unless target_indent
-
-      current_indent = m[1].length
-      return if current_indent == target_indent
-
-      stripped = line.to_s.strip
-      buf.delete_span(row, 0, row, current_indent) if current_indent > 0
-      buf.insert_text(row, 0, " " * target_indent) if target_indent > 0
-      @editor.current_window.cursor_x = target_indent + stripped.length
-    end
-
-    def clear_expired_transient_message_if_any
-      @needs_redraw = true if @editor.clear_expired_transient_message!(now: monotonic_now)
-    end
-
-    def effective_tabstop(window = @editor.current_window, buffer = @editor.current_buffer)
-      v = @editor.effective_option("tabstop", window:, buffer:).to_i
-      v.positive? ? v : 2
-    end
-
-    def insert_complete(direction)
-      state = ensure_insert_completion_state
-      return unless state
-
-      matches = state[:matches]
-      if matches.empty?
-        @editor.echo("No completion")
-        return
-      end
-
-      if state[:index].nil? && insert_completion_noselect? && matches.length > 1
-        show_insert_completion_menu(matches, selected: nil)
-        state[:index] = :pending_select
-        return
-      end
-
-      if state[:index].nil? && insert_completion_noinsert?
-        preview_idx = direction.positive? ? 0 : matches.length - 1
-        state[:index] = :pending_insert
-        state[:pending_index] = preview_idx
-        show_insert_completion_menu(matches, selected: preview_idx, current: matches[preview_idx])
-        return
-      end
-
-      idx = state[:index]
-      idx = nil if idx == :pending_select
-      if idx == :pending_insert
-        idx = state.delete(:pending_index) || (direction.positive? ? 0 : matches.length - 1)
-      else
-        idx = idx.nil? ? (direction.positive? ? 0 : matches.length - 1) : (idx + direction) % matches.length
-      end
-      replacement = matches[idx]
-
-      end_col = state[:current_end_col]
-      start_col = state[:start_col]
-      @editor.current_buffer.delete_span(state[:row], start_col, state[:row], end_col)
-      _y, new_x = @editor.current_buffer.insert_text(state[:row], start_col, replacement)
-      @editor.current_window.cursor_y = state[:row]
-      @editor.current_window.cursor_x = new_x
-      state[:index] = idx
-      state[:current_end_col] = start_col + replacement.length
-      if matches.length == 1
-        @editor.echo(replacement)
-      else
-        show_insert_completion_menu(matches, selected: idx, current: replacement)
-      end
-    rescue StandardError => e
-      @editor.echo_error("Completion error: #{e.message}")
-      clear_insert_completion
-    end
-
-    def insert_completion_noselect?
-      @editor.effective_option("completeopt").to_s.split(",").map { |s| s.strip.downcase }.include?("noselect")
-    end
-
-    def insert_completion_noinsert?
-      @editor.effective_option("completeopt").to_s.split(",").map { |s| s.strip.downcase }.include?("noinsert")
-    end
-
-    def insert_completion_menu_enabled?
-      opts = @editor.effective_option("completeopt").to_s.split(",").map { |s| s.strip.downcase }
-      opts.include?("menu") || opts.include?("menuone")
-    end
-
-    def show_insert_completion_menu(matches, selected:, current: nil)
-      if insert_completion_menu_enabled?
-        limit = [@editor.effective_option("pumheight").to_i, 1].max
-        items = matches.first(limit).each_with_index.map do |m, i|
-          i == selected ? "[#{m}]" : m
-        end
-        items << "..." if matches.length > limit
-        if current
-          @editor.echo("#{current} (#{selected + 1}/#{matches.length}) | #{items.join(' ')}")
-        else
-          @editor.echo(items.join(" "))
-        end
-      elsif current
-        @editor.echo("#{current} (#{selected + 1}/#{matches.length})")
-      end
-    end
-
-    def ensure_insert_completion_state
-      row = @editor.current_window.cursor_y
-      col = @editor.current_window.cursor_x
-      line = @editor.current_buffer.line_at(row)
-      prefix = trailing_keyword_fragment(line[0...col].to_s, @editor.current_window, @editor.current_buffer)
-      return nil if prefix.nil? || prefix.empty?
-
-      start_col = col - prefix.length
-      current_token = line[start_col...col].to_s
-      state = @insert_completion
-
-      if state &&
-         state[:row] == row &&
-         state[:start_col] == start_col &&
-         state[:prefix] == prefix &&
-         col == state[:current_end_col]
-        return state
-      end
-
-      matches = collect_buffer_word_completions(prefix, current_word: current_token)
-      @insert_completion = {
-        row: row,
-        start_col: start_col,
-        prefix: prefix,
-        matches: matches,
-        index: nil,
-        current_end_col: col
-      }
-    end
-
-    def collect_buffer_word_completions(prefix, current_word:)
-      words = []
-      seen = {}
-      rx = keyword_scan_regex(@editor.current_window, @editor.current_buffer)
-      @editor.buffers.values.each do |buf|
-        buf.lines.each do |line|
-          line.scan(rx) do |w|
-            next unless w.start_with?(prefix)
-            next if w == current_word
-            next if seen[w]
-
-            seen[w] = true
-            words << w
-          end
-        end
-      end
-      words.sort
-    end
-
-    def track_mode_transition(mode_before)
-      mode_after = @editor.mode
-      if mode_before != :insert && mode_after == :insert
-        @insert_start_location = @editor.current_location
-      elsif mode_before == :insert && mode_after != :insert
-        @insert_start_location = nil
-      end
-
-      if mode_before != :command_line && mode_after == :command_line
-        @incsearch_preview = nil
-      elsif mode_before == :command_line && mode_after != :command_line
-        @incsearch_preview = nil
-      end
-    end
-
-    def insert_backspace_allowed?
-      buf = @editor.current_buffer
-      win = @editor.current_window
-      row = win.cursor_y
-      col = win.cursor_x
-      return false if row.zero? && col.zero?
-
-      opt = @editor.effective_option("backspace", window: win, buffer: buf).to_s
-      allow = opt.split(",").map { |s| s.strip.downcase }.reject(&:empty?)
-      allow_all = allow.include?("2")
-      allow_indent = allow_all || allow.include?("indent")
-
-      if col.zero? && row.positive?
-        return true if allow_all || allow.include?("eol")
-
-        @editor.echo_error("backspace=eol required")
-        return false
-      end
-
-      if @insert_start_location
-        same_buf = @insert_start_location[:buffer_id] == buf.id
-        if same_buf && (row < @insert_start_location[:row] || (row == @insert_start_location[:row] && col <= @insert_start_location[:col]))
-          if allow_all || allow.include?("start")
-            return true
-          end
-
-          if allow_indent && same_row_autoindent_backspace?(buf, row, col)
-            return true
-          end
-
-          @editor.echo_error("backspace=start required")
-          return false
-        end
-      end
-
-      true
-    end
-
-    def insert_backspace_in_insert_mode
-      buf = @editor.current_buffer
-      win = @editor.current_window
-      row = win.cursor_y
-      col = win.cursor_x
-
-      if row >= 0 && col.positive? && try_softtabstop_backspace(buf, win)
-        return
-      end
-
-      y, x = buf.backspace(row, col)
-      win.cursor_y = y
-      win.cursor_x = x
-    end
-
-    def dispatch_insert_cursor_motion(id)
-      @dispatcher.dispatch(@editor, CommandInvocation.new(id: id, count: 1))
-    rescue StandardError => e
-      @editor.echo_error("Motion error: #{e.message}")
-    end
-
-    def try_softtabstop_backspace(buf, win)
-      row = win.cursor_y
-      col = win.cursor_x
-      line = buf.line_at(row)
-      return false unless line
-      return false unless @editor.effective_option("expandtab", window: win, buffer: buf)
-
-      sts = @editor.effective_option("softtabstop", window: win, buffer: buf).to_i
-      sts = @editor.effective_option("tabstop", window: win, buffer: buf).to_i if sts <= 0
-      return false if sts <= 0
-
-      prefix = line[0...col].to_s
-      m = prefix.match(/ +\z/)
-      return false unless m
-
-      run = m[0].length
-      return false if run <= 1
-
-      tabstop = effective_tabstop(win, buf)
-      cur_screen = RuVim::TextMetrics.screen_col_for_char_index(line, col, tabstop:)
-      target_screen = [cur_screen - sts, 0].max
-      target_col = RuVim::TextMetrics.char_index_for_screen_col(line, target_screen, tabstop:, align: :floor)
-      delete_cols = col - target_col
-      delete_cols = [delete_cols, run, sts].min
-      return false if delete_cols <= 1
-
-      # Only collapse whitespace run; if target lands before the run, clamp to run start.
-      run_start = col - run
-      target_col = [target_col, run_start].max
-      delete_cols = col - target_col
-      return false if delete_cols <= 1
-
-      buf.delete_span(row, target_col, row, col)
-      win.cursor_x = target_col
-      true
-    rescue StandardError
-      false
-    end
-
-    def same_row_autoindent_backspace?(buf, row, col)
-      return false unless @insert_start_location
-      return false unless row == @insert_start_location[:row]
-      return false unless col <= @insert_start_location[:col]
-
-      line = buf.line_at(row)
-      line[0...@insert_start_location[:col]].to_s.match?(/\A[ \t]*\z/)
-    rescue StandardError
-      false
-    end
-
-    def incsearch_enabled?
-      return false unless @editor.command_line_active?
-      return false unless ["/", "?"].include?(@editor.command_line.prefix)
-
-      !!@editor.effective_option("incsearch")
-    end
-
-    def update_incsearch_preview_if_needed
-      return unless incsearch_enabled?
-
-      cmd = @editor.command_line
-      ensure_incsearch_preview_origin!(direction: (cmd.prefix == "/" ? :forward : :backward))
-      pattern = cmd.text.to_s
-      if pattern.empty?
-        clear_incsearch_preview_state(apply: false)
-        return
-      end
-
-      buf = @editor.current_buffer
-      win = @editor.current_window
-      origin = @incsearch_preview[:origin]
-      tmp_window = RuVim::Window.new(id: -1, buffer_id: buf.id)
-      tmp_window.cursor_y = origin[:row]
-      tmp_window.cursor_x = origin[:col]
-      regex = GlobalCommands.instance.send(:compile_search_regex, pattern, editor: @editor, window: win, buffer: buf)
-      match = GlobalCommands.instance.send(:find_next_match, buf, tmp_window, regex, direction: @incsearch_preview[:direction])
-      if match
-        win.cursor_y = match[:row]
-        win.cursor_x = match[:col]
-        win.clamp_to_buffer(buf)
-      end
-      @incsearch_preview[:active] = true
-    rescue RuVim::CommandError, RegexpError
-      # Keep editing command-line without forcing an error flash on every keystroke.
-    end
-
-    def ensure_incsearch_preview_origin!(direction:)
-      return if @incsearch_preview
-
-      @incsearch_preview = {
-        origin: @editor.current_location,
-        direction: direction,
-        active: false
-      }
-    end
-
-    def cancel_incsearch_preview_if_any
-      clear_incsearch_preview_state(apply: false)
-    end
-
-    def clear_incsearch_preview_state(apply:)
-      return unless @incsearch_preview
-
-      if !apply && @incsearch_preview[:origin]
-        @editor.jump_to_location(@incsearch_preview[:origin])
-      end
-      @incsearch_preview = nil
-    end
-
-    def trailing_keyword_fragment(prefix_text, window, buffer)
-      cls = keyword_char_class(window, buffer)
-      prefix_text.to_s[/[#{cls}]+\z/]
-    rescue RegexpError
-      prefix_text.to_s[/[[:alnum:]_]+\z/]
-    end
-
-    def keyword_scan_regex(window, buffer)
-      cls = keyword_char_class(window, buffer)
-      /[#{cls}]+/
-    rescue RegexpError
-      /[[:alnum:]_]+/
-    end
-
-    def keyword_char_class(window, buffer)
-      raw = @editor.effective_option("iskeyword", window:, buffer:).to_s
-      RuVim::KeywordChars.char_class(raw)
-    rescue StandardError
-      "[:alnum:]_"
-    end
-
-    def ex_completion_context(cmd)
-      text = cmd.text
-      cursor = cmd.cursor
-      token_start = token_start_index(text, cursor)
-      token_end = token_end_index(text, cursor)
-      prefix = text[token_start...cursor].to_s
-      before = text[0...token_start].to_s
-      argv_before = before.split(/\s+/).reject(&:empty?)
-
-      if argv_before.empty?
-        {
-          kind: :command,
-          token_start: token_start,
-          token_end: token_end,
-          prefix: prefix
-        }
-      else
-        {
-          kind: :arg,
-          command: argv_before.first,
-          arg_index: argv_before.length - 1,
-          token_start: token_start,
-          token_end: token_end,
-          prefix: prefix
-        }
-      end
-    end
-
-    def ex_completion_candidates(ctx)
-      case ctx[:kind]
-      when :command
-        ExCommandRegistry.instance.all.flat_map { |spec| [spec.name, *spec.aliases] }.uniq.sort.select { |n| n.start_with?(ctx[:prefix]) }
-      when :arg
-        ex_arg_completion_candidates(ctx[:command], ctx[:arg_index], ctx[:prefix])
-      else
-        []
-      end
-    end
-
-    def ex_arg_completion_candidates(command_name, arg_index, prefix)
-      cmd = command_name.to_s
-      return [] unless arg_index.zero?
-
-      if %w[e edit w write tabnew].include?(cmd)
-        return path_completion_candidates(prefix)
-      end
-
-      if %w[buffer b].include?(cmd)
-        return buffer_completion_candidates(prefix)
-      end
-
-      if %w[set setlocal setglobal].include?(cmd)
-        return option_completion_candidates(prefix)
-      end
-
-      if cmd == "git"
-        return Git::Handler::GIT_SUBCOMMANDS.keys.sort.select { |s| s.start_with?(prefix) }
-      end
-
-      []
-    end
-
-    def path_completion_candidates(prefix)
-      input = prefix.to_s
-      base_dir =
-        if input.empty?
-          "."
-        elsif input.end_with?("/")
-          input
-        else
-          File.dirname(input)
-        end
-      partial = input.end_with?("/") ? "" : File.basename(input)
-      pattern =
-        if input.empty?
-          "*"
-        elsif base_dir == "."
-          "#{partial}*"
-        else
-          File.join(base_dir, "#{partial}*")
-        end
-      partial_starts_with_dot = partial.start_with?(".")
-      entries = Dir.glob(pattern, File::FNM_DOTMATCH).filter_map do |p|
-        next if [".", ".."].include?(File.basename(p))
-        next unless p.start_with?(input) || input.empty?
-        next if wildignore_path?(p)
-        File.directory?(p) ? "#{p}/" : p
-      end
-      entries.sort_by do |p|
-        base = File.basename(p.to_s.sub(%r{/\z}, ""))
-        hidden_rank = (!partial_starts_with_dot && base.start_with?(".")) ? 1 : 0
-        [hidden_rank, p]
-      end
-    rescue StandardError
-      []
-    end
-
-    def wildignore_path?(path)
-      spec = @editor.global_options["wildignore"].to_s
-      return false if spec.empty?
-
-      flags = @editor.global_options["wildignorecase"] ? File::FNM_CASEFOLD : 0
-      name = path.to_s
-      base = File.basename(name)
-      spec.split(",").map(&:strip).reject(&:empty?).any? do |pat|
-        File.fnmatch?(pat, name, flags) || File.fnmatch?(pat, base, flags)
-      end
-    rescue StandardError
-      false
-    end
-
-    def buffer_completion_candidates(prefix)
-      pfx = prefix.to_s
-      items = @editor.buffers.values.flat_map do |b|
-        path = b.path.to_s
-        base = path.empty? ? nil : File.basename(path)
-        [b.id.to_s, path, base].compact
-      end.uniq.sort
-      items.select { |s| s.start_with?(pfx) }
-    end
-
-    def option_completion_candidates(prefix)
-      pfx = prefix.to_s
-      names = RuVim::Editor::OPTION_DEFS.keys
-      tokens = names + names.map { |n| "no#{n}" } + names.map { |n| "inv#{n}" } + names.map { |n| "#{n}?" }
-      tokens.uniq.sort.select { |s| s.start_with?(pfx) }
-    end
-
-    def token_start_index(text, cursor)
-      i = [[cursor, 0].max, text.length].min
-      i -= 1 while i.positive? && !whitespace_char?(text[i - 1])
-      i
-    end
-
-    def token_end_index(text, cursor)
-      i = [[cursor, 0].max, text.length].min
-      i += 1 while i < text.length && !whitespace_char?(text[i])
-      i
-    end
-
-    def whitespace_char?(ch)
-      ch && ch.match?(/\s/)
-    end
-
-    def install_signal_handlers
-      Signal.trap("WINCH") do
-        @screen.invalidate_cache! if @screen.respond_to?(:invalidate_cache!)
-        @needs_redraw = true
-        notify_signal_wakeup
-      end
-    rescue ArgumentError
-      nil
-    end
-
-    def init_config_loader!
-      @config_loader = ConfigLoader.new(
-        command_registry: CommandRegistry.instance,
-        ex_registry: ExCommandRegistry.instance,
-        keymaps: @keymaps,
-        command_host: GlobalCommands.instance
-      )
-    end
-
-    def load_user_config!
-      return if @clean_mode || @restricted_mode
-      return if @skip_user_config
-
-      if @config_path
-        @config_loader.load_file(@config_path)
-      else
-        @config_loader.load_default!
-      end
-    rescue StandardError => e
-      @editor.echo_error("config error: #{e.message}")
-    end
-
-    def load_current_ftplugin!
-      return if @clean_mode || @restricted_mode
-      return unless @config_loader
-
-      @config_loader.load_ftplugin!(@editor, @editor.current_buffer)
-    rescue StandardError => e
-      @editor.echo_error("ftplugin error: #{e.message}")
-    end
-
-    def run_startup_action!(action, log_prefix: "startup")
-      case action[:type]
-      when :ex
-        verbose_log(2, "#{log_prefix} ex: #{action[:value]}")
-        @dispatcher.dispatch_ex(@editor, action[:value].to_s)
-      when :line
-        verbose_log(2, "#{log_prefix} line: #{action[:value]}")
-        move_cursor_to_line(action[:value].to_i)
-      when :line_end
-        verbose_log(2, "#{log_prefix} line_end")
-        move_cursor_to_line(@editor.current_buffer.line_count)
-      end
-    end
-
-    def verbose_log(level, message)
-      return if @verbose_level.to_i < level.to_i
-      return unless @verbose_io
-
-      @verbose_io.puts("[ruvim:v#{@verbose_level}] #{message}")
-      @verbose_io.flush if @verbose_io.respond_to?(:flush)
-    rescue StandardError
-      nil
-    end
-
-    def startup_mark(label)
-      return unless @startup_time_path
-
-      @startup_timeline << [label.to_s, monotonic_now]
-    end
-
-    def write_startuptime_log!
-      return unless @startup_time_path
-
-      prev = @startup_time_origin
-      lines = @startup_timeline.map do |label, t|
-        total_ms = ((t - @startup_time_origin) * 1000.0)
-        delta_ms = ((t - prev) * 1000.0)
-        prev = t
-        format("%9.3f %9.3f %s", total_ms, delta_ms, label)
-      end
-      File.write(@startup_time_path, lines.join("\n") + "\n")
-    rescue StandardError => e
-      verbose_log(1, "startuptime write error: #{e.message}")
-    end
-
-    def monotonic_now
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    rescue StandardError
-      Time.now.to_f
-    end
-
-    def apply_startup_readonly!
-      buf = @editor.current_buffer
-      return unless buf&.file_buffer?
-
-      buf.readonly = true
-      @editor.echo("readonly: #{buf.display_name}")
-    end
-
-    def apply_startup_follow!
-      buf = @editor.current_buffer
-      return unless buf&.file_buffer?
-      return if @follow_watchers[buf.id]
-
-      win = @editor.current_window
-      win.cursor_y = buf.line_count - 1
-      win.clamp_to_buffer(buf)
-      start_follow!(buf)
-    end
-
-    def apply_startup_nomodifiable!
-      buf = @editor.current_buffer
-      return unless buf&.file_buffer?
-
-      buf.modifiable = false
-      buf.readonly = true
-      @editor.echo("nomodifiable: #{buf.display_name}")
-    end
-
-    def apply_startup_compat_mode_messages!
-      if @startup_diff_mode
-        verbose_log(1, "startup: -d requested (diff mode placeholder)")
-        @editor.echo("diff mode (-d) is not implemented yet")
-      end
-
-      if @startup_quickfix_errorfile
-        verbose_log(1, "startup: -q #{@startup_quickfix_errorfile} requested (quickfix placeholder)")
-        @editor.echo("quickfix startup (-q #{@startup_quickfix_errorfile}) is not implemented yet")
-      end
-
-      if @startup_session_file
-        verbose_log(1, "startup: -S #{@startup_session_file} requested (session placeholder)")
-        @editor.echo("session startup (-S #{@startup_session_file}) is not implemented yet")
-      end
-    end
-
-    def open_startup_paths!(paths)
-      list = Array(paths).compact
-      return if list.empty?
-
-      # Remove the bootstrap empty buffer and reset the ID counter
-      # so the first file gets buffer id 1 (Vim-like behavior).
-      evict_bootstrap_buffer!
-
-      # Initialize arglist with all paths
-      @editor.set_arglist(list)
-
-      first, *rest = list
-      @editor.open_path(first)
-      apply_startup_readonly! if @startup_readonly
-      apply_startup_nomodifiable! if @startup_nomodifiable
-      apply_startup_follow! if @startup_follow
-
-      case @startup_open_layout
-      when :horizontal
-        first_win_id = @editor.current_window_id
-        rest.each { |p| open_path_in_split!(p, layout: :horizontal) }
-        @editor.focus_window(first_win_id)
-      when :vertical
-        first_win_id = @editor.current_window_id
-        rest.each { |p| open_path_in_split!(p, layout: :vertical) }
-        @editor.focus_window(first_win_id)
-      when :tab
-        rest.each { |p| open_path_in_tab!(p) }
-        @editor.tabnext(-(@editor.tabpage_count - 1))
-      else
-        # Load remaining files as buffers (Vim-like behavior).
-        rest.each do |p|
-          buf = @editor.add_buffer_from_file(p)
-          start_follow!(buf) if @startup_follow
-        end
-      end
-    end
-
-    # Remove the bootstrap empty buffer before opening real files,
-    # resetting the buffer ID counter so the first file gets id 1.
-    def evict_bootstrap_buffer!
-      bid = @editor.buffer_ids.find do |id|
-        b = @editor.buffers[id]
-        b.path.nil? && !b.modified? && b.line_count <= 1 && b.kind == :file
-      end
-      return unless bid
-
-      @editor.buffers.delete(bid)
-      @editor.instance_variable_set(:@next_buffer_id, 1)
-    end
-
-    def open_path_in_split!(path, layout:)
-      @editor.split_current_window(layout:)
-      @editor.open_path(path)
-      apply_startup_readonly! if @startup_readonly
-      apply_startup_nomodifiable! if @startup_nomodifiable
-      apply_startup_follow! if @startup_follow
+    def open_path_in_split!(path, layout:)
+      @editor.split_current_window(layout:)
+      @editor.open_path(path)
+      apply_startup_buffer_flags!
     end
 
     def open_path_in_tab!(path)
       @editor.tabnew(path:)
-      apply_startup_readonly! if @startup_readonly
-      apply_startup_nomodifiable! if @startup_nomodifiable
-      apply_startup_follow! if @startup_follow
-    end
-
-    def open_path_with_large_file_support(path)
-      return @editor.open_path_sync(path) unless should_open_path_async?(path)
-      return @editor.open_path_sync(path) unless can_start_async_file_load?
-
-      open_path_asynchronously!(path)
-    end
-
-    def should_open_path_async?(path)
-      p = path.to_s
-      return false if p.empty?
-      return false unless File.file?(p)
-
-      File.size(p) >= large_file_async_threshold_bytes
-    rescue StandardError
-      false
-    end
-
-    def can_start_async_file_load?
-      @async_file_loads.empty?
-    end
-
-    def large_file_async_threshold_bytes
-      raw = ENV["RUVIM_ASYNC_FILE_THRESHOLD_BYTES"]
-      n = raw.to_i if raw
-      return n if n && n.positive?
-
-      LARGE_FILE_ASYNC_THRESHOLD_BYTES
-    end
-
-    def open_path_asynchronously!(path)
-      file_size = File.size(path)
-      buf = @editor.add_empty_buffer(path: path)
-      @editor.switch_to_buffer(buf.id)
-      buf.loading_state = :live
-      buf.modified = false
-
-      ensure_stream_event_queue!
-      io = File.open(path, "rb")
-      state = { path: path, io: io, thread: nil, ended_with_newline: false }
-      staged_prefix_bytes = async_file_staged_prefix_bytes
-      staged_mode = file_size > staged_prefix_bytes
-      if staged_mode
-        prefix = io.read(staged_prefix_bytes) || "".b
-        unless prefix.empty?
-          buf.append_stream_text!(Buffer.decode_text(prefix))
-          state[:ended_with_newline] = prefix.end_with?("\n")
-        end
-      end
-
-      if io.eof?
-        buf.finalize_async_file_load!(ended_with_newline: state[:ended_with_newline])
-        buf.loading_state = :closed
-        io.close unless io.closed?
-        return buf
-      end
-
-      @async_file_loads[buf.id] = state
-      state[:thread] = start_async_file_loader_thread(buf.id, io, bulk_once: staged_mode)
-
-      size_mb = file_size.fdiv(1024 * 1024)
-      if staged_mode
-        @editor.echo(format("\"%s\" loading... (showing first %.0fMB of %.1fMB)", path, staged_prefix_bytes.fdiv(1024 * 1024), size_mb))
-      else
-        @editor.echo(format("\"%s\" loading... (%.1fMB)", path, size_mb))
-      end
-      buf
-    rescue StandardError
-      @async_file_loads.delete(buf.id) if buf
-      raise
-    end
-
-    def async_file_staged_prefix_bytes
-      raw = ENV["RUVIM_ASYNC_FILE_PREFIX_BYTES"]
-      n = raw.to_i if raw
-      return n if n && n.positive?
-
-      LARGE_FILE_STAGED_PREFIX_BYTES
-    end
-
-    def start_async_file_loader_thread(buffer_id, io, bulk_once: false)
-      Thread.new do
-        if bulk_once
-          rest = io.read || "".b
-          unless rest.empty?
-            @stream_event_queue << { type: :file_data, buffer_id: buffer_id, data: Buffer.decode_text(rest) }
-            notify_signal_wakeup
-          end
-          @stream_event_queue << { type: :file_eof, buffer_id: buffer_id, ended_with_newline: rest.end_with?("\n") }
-          notify_signal_wakeup
-          next
-        end
-
-        ended_with_newline = false
-        pending_text = +""
-        loop do
-          chunk = io.readpartial(ASYNC_FILE_READ_CHUNK_BYTES)
-          next if chunk.nil? || chunk.empty?
-
-          ended_with_newline = chunk.end_with?("\n")
-          pending_text << Buffer.decode_text(chunk)
-          next if pending_text.bytesize < ASYNC_FILE_EVENT_FLUSH_BYTES
-
-          @stream_event_queue << { type: :file_data, buffer_id: buffer_id, data: pending_text }
-          pending_text = +""
-          notify_signal_wakeup
-        end
-      rescue EOFError
-        unless pending_text.empty?
-          @stream_event_queue << { type: :file_data, buffer_id: buffer_id, data: pending_text }
-          notify_signal_wakeup
-        end
-        @stream_event_queue << { type: :file_eof, buffer_id: buffer_id, ended_with_newline: ended_with_newline }
-        notify_signal_wakeup
-      rescue StandardError => e
-        @stream_event_queue << { type: :file_error, buffer_id: buffer_id, error: e.message.to_s }
-        notify_signal_wakeup
-      ensure
-        begin
-          io.close unless io.closed?
-        rescue StandardError
-          nil
-        end
-      end
-    end
-
-    def prepare_stdin_stream_buffer!
-      buf = @editor.current_buffer
-      if buf.intro_buffer?
-        @editor.materialize_intro_buffer!
-        buf = @editor.current_buffer
-      end
-
-      buf.replace_all_lines!([""])
-      buf.configure_special!(kind: :stream, name: "[stdin]", readonly: true, modifiable: false)
-      buf.modified = false
-      buf.stream_state = :live
-      buf.options["filetype"] = "text"
-      @stream_stop_requested = false
-      ensure_stream_event_queue!
-      @stream_buffer_id = buf.id
-      move_window_to_stream_end!(@editor.current_window, buf)
-      @editor.echo("[stdin] follow")
-    end
-
-    def stdin_stream_stop_command
-      return if stop_stdin_stream!
-
-      handle_normal_ctrl_c
-    end
-
-    def stop_stdin_stream!
-      buf = @editor.buffers[@stream_buffer_id]
-      return false unless buf&.kind == :stream
-      return false unless (buf.stream_state || :live) == :live
-
-      @stream_stop_requested = true
-      io = @stdin_stream_source
-      @stdin_stream_source = nil
-      begin
-        io.close if io && io.respond_to?(:close) && !(io.respond_to?(:closed?) && io.closed?)
-      rescue StandardError
-        nil
-      end
-      if @stream_reader_thread&.alive?
-        @stream_reader_thread.kill
-        @stream_reader_thread.join(0.05)
-      end
-      @stream_reader_thread = nil
-
-      buf.stream_state = :closed
-      @editor.echo("[stdin] closed")
-      notify_signal_wakeup
-      true
-    end
-
-    def start_stdin_stream_reader!
-      return unless @stdin_stream_source
-      ensure_stream_event_queue!
-      return if @stream_reader_thread&.alive?
-
-      @stream_stop_requested = false
-      io = @stdin_stream_source
-      @stream_reader_thread = Thread.new do
-        loop do
-          chunk = io.readpartial(4096)
-          next if chunk.nil? || chunk.empty?
-
-          @stream_event_queue << { type: :data, data: Buffer.decode_text(chunk) }
-          notify_signal_wakeup
-        end
-      rescue EOFError
-        unless @stream_stop_requested
-          @stream_event_queue << { type: :eof }
-          notify_signal_wakeup
-        end
-      rescue IOError => e
-        unless @stream_stop_requested
-          @stream_event_queue << { type: :error, error: e.message.to_s }
-          notify_signal_wakeup
-        end
-      rescue StandardError => e
-        unless @stream_stop_requested
-          @stream_event_queue << { type: :error, error: e.message.to_s }
-          notify_signal_wakeup
-        end
-      end
-    end
-
-    def drain_stream_events!
-      return false unless @stream_event_queue
-
-      changed = false
-      loop do
-        event = @stream_event_queue.pop(true)
-        case event[:type]
-        when :data
-          changed = apply_stream_chunk!(event[:data]) || changed
-        when :eof
-          if (buf = @editor.buffers[@stream_buffer_id])
-            buf.stream_state = :closed
-          end
-          @editor.echo("[stdin] EOF")
-          changed = true
-        when :error
-          next if ignore_stream_shutdown_error?(event[:error])
-          if (buf = @editor.buffers[@stream_buffer_id])
-            buf.stream_state = :error
-          end
-          @editor.echo_error("[stdin] stream error: #{event[:error]}")
-          changed = true
-        when :follow_data
-          changed = apply_follow_chunk!(event[:buffer_id], event[:data]) || changed
-        when :follow_truncated
-          if (buf = @editor.buffers[event[:buffer_id]])
-            @editor.echo("[follow] file truncated: #{buf.display_name}")
-            changed = true
-          end
-        when :follow_deleted
-          if (buf = @editor.buffers[event[:buffer_id]])
-            @editor.echo("[follow] file deleted, waiting for re-creation: #{buf.display_name}")
-            changed = true
-          end
-        when :file_data
-          changed = apply_async_file_chunk!(event[:buffer_id], event[:data]) || changed
-        when :file_eof
-          changed = finish_async_file_load!(event[:buffer_id], ended_with_newline: event[:ended_with_newline]) || changed
-        when :file_error
-          changed = fail_async_file_load!(event[:buffer_id], event[:error]) || changed
-        when :git_cmd_data
-          changed = apply_git_stream_chunk!(event[:buffer_id], event[:data]) || changed
-        when :git_cmd_eof
-          changed = finish_git_stream!(event[:buffer_id]) || changed
-        when :git_cmd_error
-          changed = fail_git_stream!(event[:buffer_id], event[:error]) || changed
-        end
-      end
-    rescue ThreadError
-      changed
-    end
-
-    def apply_stream_chunk!(text)
-      return false if text.to_s.empty?
-
-      buf = @editor.buffers[@stream_buffer_id]
-      return false unless buf
-
-      follow_window_ids = @editor.windows.values.filter_map do |win|
-        next unless win.buffer_id == buf.id
-        next unless stream_window_following_end?(win, buf)
-
-        win.id
-      end
-
-      buf.append_stream_text!(text)
-
-      follow_window_ids.each do |win_id|
-        win = @editor.windows[win_id]
-        move_window_to_stream_end!(win, buf) if win
-      end
-
-      true
-    end
-
-    def apply_async_file_chunk!(buffer_id, text)
-      return false if text.to_s.empty?
-
-      buf = @editor.buffers[buffer_id]
-      return false unless buf
-
-      buf.append_stream_text!(text)
-      true
-    end
-
-    def finish_async_file_load!(buffer_id, ended_with_newline:)
-      @async_file_loads.delete(buffer_id)
-      buf = @editor.buffers[buffer_id]
-      return false unless buf
-
-      buf.finalize_async_file_load!(ended_with_newline: !!ended_with_newline)
-      buf.loading_state = :closed
-      true
-    end
-
-    def fail_async_file_load!(buffer_id, error)
-      state = @async_file_loads.delete(buffer_id)
-      buf = @editor.buffers[buffer_id]
-      if buf
-        buf.loading_state = :error
-      end
-      @editor.echo_error("\"#{(state && state[:path]) || (buf && buf.display_name) || buffer_id}\" load error: #{error}")
-      true
-    end
-
-    def stream_window_following_end?(win, buf)
-      return false unless win
-
-      last_row = buf.line_count - 1
-      win.cursor_y >= last_row
-    end
-
-    def move_window_to_stream_end!(win, buf)
-      return unless win && buf
-
-      last_row = buf.line_count - 1
-      win.cursor_y = last_row
-      win.cursor_x = buf.line_length(last_row)
-      win.clamp_to_buffer(buf)
-    end
-
-    def shutdown_stream_reader!
-      thread = @stream_reader_thread
-      @stream_reader_thread = nil
-      @stream_stop_requested = true
-      return unless thread
-      return unless thread.alive?
-
-      thread.kill
-      thread.join(0.05)
-    rescue StandardError
-      nil
-    end
-
-    def ex_follow_toggle
-      buf = @editor.current_buffer
-      raise RuVim::CommandError, "No file associated with buffer" unless buf.path
-
-      if @follow_watchers[buf.id]
-        stop_follow!(buf)
-      else
-        raise RuVim::CommandError, "Buffer has unsaved changes" if buf.modified?
-        start_follow!(buf)
-      end
-    end
-
-    def start_follow!(buf)
-      ensure_stream_event_queue!
-      if buf.path && File.exist?(buf.path)
-        data = File.binread(buf.path)
-        if data.end_with?("\n") && buf.lines.last.to_s != ""
-          following_wins = @editor.windows.values.select do |w|
-            w.buffer_id == buf.id && stream_window_following_end?(w, buf)
-          end
-          buf.append_stream_text!("\n")
-          following_wins.each { |w| move_window_to_stream_end!(w, buf) }
-        end
-      end
-      buffer_id = buf.id
-      watcher = FileWatcher.create(buf.path) do |type, data|
-        case type
-        when :data
-          @stream_event_queue << { type: :follow_data, buffer_id: buffer_id, data: data }
-        when :truncated
-          @stream_event_queue << { type: :follow_truncated, buffer_id: buffer_id }
-        when :deleted
-          @stream_event_queue << { type: :follow_deleted, buffer_id: buffer_id }
-        end
-        notify_signal_wakeup
-      end
-      watcher.start
-      @follow_watchers[buf.id] = watcher
-      buf.stream_state = :live
-      buf.follow_backend = watcher.backend
-      @editor.echo("[follow] #{buf.display_name}")
-    end
-
-    def stop_follow!(buf)
-      watcher = @follow_watchers.delete(buf.id)
-      watcher&.stop
-      # Remove trailing empty line added as sentinel by start_follow!
-      if buf.line_count > 1 && buf.lines.last.to_s == ""
-        buf.lines.pop
-        last = buf.line_count - 1
-        @editor.windows.each_value do |win|
-          next unless win.buffer_id == buf.id
-          win.cursor_y = last if win.cursor_y > last
-        end
-      end
-      buf.stream_state = nil
-      buf.follow_backend = nil
-      @editor.echo("[follow] stopped")
-    end
-
-    def apply_follow_chunk!(buffer_id, text)
-      return false if text.to_s.empty?
-
-      buf = @editor.buffers[buffer_id]
-      return false unless buf
-
-      follow_window_ids = @editor.windows.values.filter_map do |win|
-        next unless win.buffer_id == buf.id
-        next unless stream_window_following_end?(win, buf)
-
-        win.id
-      end
-
-      buf.append_stream_text!(text)
-
-      follow_window_ids.each do |win_id|
-        win = @editor.windows[win_id]
-        move_window_to_stream_end!(win, buf) if win
-      end
-
-      true
-    end
-
-    def shutdown_follow_watchers!
-      watchers = @follow_watchers
-      @follow_watchers = {}
-      watchers.each_value do |watcher|
-        watcher.stop
-      rescue StandardError
-        nil
-      end
-    end
-
-    def shutdown_async_file_loaders!
-      loaders = @async_file_loads
-      @async_file_loads = {}
-      loaders.each_value do |state|
-        io = state[:io]
-        thread = state[:thread]
-        begin
-          io.close if io && !io.closed?
-        rescue StandardError
-          nil
-        end
-        next unless thread&.alive?
-
-        thread.kill
-        thread.join(0.05)
-      rescue StandardError
-        nil
-      end
-    end
-
-    def shutdown_background_readers!
-      shutdown_stream_reader!
-      shutdown_follow_watchers!
-      shutdown_async_file_loaders!
-    end
-
-    def ignore_stream_shutdown_error?(message)
-      buf = @editor.buffers[@stream_buffer_id]
-      return false unless buf&.kind == :stream
-      return false unless (buf.stream_state || :live) == :closed
-
-      msg = message.to_s.downcase
-      msg.include?("stream closed") || msg.include?("closed in another thread")
-    end
-
-    def ensure_stream_event_queue!
-      @stream_event_queue ||= Queue.new
-    end
-
-    def apply_git_stream_chunk!(buffer_id, text)
-      return false if text.to_s.empty?
-
-      buf = @editor.buffers[buffer_id]
-      return false unless buf
-
-      buf.append_stream_text!(text)
-      true
-    end
-
-    def finish_git_stream!(buffer_id)
-      @git_stream_ios&.delete(buffer_id)
-      @git_stream_threads&.delete(buffer_id)
-      buf = @editor.buffers[buffer_id]
-      return false unless buf
-
-      # Remove trailing empty line if present
-      if buf.lines.length > 1 && buf.lines[-1] == ""
-        buf.lines.pop
-      end
-      line_count = buf.line_count
-      @editor.echo("#{buf.name} #{line_count} lines")
-      true
-    end
-
-    def fail_git_stream!(buffer_id, error)
-      @git_stream_ios&.delete(buffer_id)
-      @git_stream_threads&.delete(buffer_id)
-      buf = @editor.buffers[buffer_id]
-      @editor.echo_error("git stream error: #{error}") if buf
-      true
-    end
-
-    def start_git_stream_command(buffer_id, cmd, root)
-      ensure_stream_event_queue!
-      @git_stream_ios ||= {}
-      @git_stream_threads ||= {}
-      queue = @stream_event_queue
-      ios = @git_stream_ios
-      @git_stream_threads[buffer_id] = Thread.new do
-        IO.popen(cmd, chdir: root, err: [:child, :out]) do |io|
-          ios[buffer_id] = io
-          while (chunk = io.read(4096))
-            queue << { type: :git_cmd_data, buffer_id: buffer_id, data: Buffer.decode_text(chunk) }
-            notify_signal_wakeup
-          end
-        end
-        ios.delete(buffer_id)
-        queue << { type: :git_cmd_eof, buffer_id: buffer_id }
-        notify_signal_wakeup
-      rescue StandardError => e
-        ios.delete(buffer_id)
-        queue << { type: :git_cmd_error, buffer_id: buffer_id, error: e.message.to_s }
-        notify_signal_wakeup
-      end
-    end
-
-    def stop_git_stream!(buffer_id)
-      io = @git_stream_ios&.delete(buffer_id)
-      io&.close
-    rescue IOError
-      # already closed
+      apply_startup_buffer_flags!
     end
 
     def move_cursor_to_line(line_number)
@@ -3227,7 +666,7 @@ module RuVim
       buf = @editor.current_buffer
       return unless win && buf
 
-      target = [[line_number.to_i - 1, 0].max, buf.line_count - 1].min
+      target = [[line_number - 1, 0].max, buf.line_count - 1].min
       win.cursor_y = target
       win.clamp_to_buffer(buf)
     end