debug 1.6.1 → 1.9.1

data/lib/debug/session.rb

@@ -22,8 +22,9 @@ end
 # restore RUBYOPT
 if (added_opt = ENV['RUBY_DEBUG_ADDED_RUBYOPT']) &&
    (rubyopt = ENV['RUBYOPT']) &&
-   rubyopt.start_with?(added_opt)
-  ENV['RUBYOPT'] = rubyopt.delete_prefix(rubyopt)
+   rubyopt.end_with?(added_opt)
+
+  ENV['RUBYOPT'] = rubyopt.delete_suffix(added_opt)
   ENV['RUBY_DEBUG_ADDED_RUBYOPT'] = nil
 end
 
@@ -81,14 +82,16 @@ class RubyVM::InstructionSequence
   def first_line
     self.to_a[4][:code_location][0]
   end unless method_defined?(:first_line)
-end
+end if defined?(RubyVM::InstructionSequence)
 
 module DEBUGGER__
-  PresetCommand = Struct.new(:commands, :source, :auto_continue)
+  PresetCommands = Struct.new(:commands, :source, :auto_continue)
+  SessionCommand = Struct.new(:block, :repeat, :unsafe, :cancel_auto_continue, :postmortem)
+
   class PostmortemError < RuntimeError; end
 
   class Session
-    attr_reader :intercepted_sigint_cmd, :process_group
+    attr_reader :intercepted_sigint_cmd, :process_group, :subsession_id
 
     include Color
 
@@ -115,6 +118,7 @@ module DEBUGGER__
       @intercepted_sigint_cmd = 'DEFAULT'
       @process_group = ProcessGroup.new
       @subsession_stack = []
+      @subsession_id = 0
 
       @frame_map = {} # for DAP: {id => [threadId, frame_depth]} and CDP: {id => frame_depth}
       @var_map   = {1 => [:globals], } # {id => ...} for DAP
@@ -124,33 +128,58 @@ module DEBUGGER__
       @obj_map = {} # { object_id => ... } for CDP
 
       @tp_thread_begin = nil
+      @tp_thread_end = nil
+
+      @commands = {}
+      @unsafe_context = false
+
+      @has_keep_script_lines = defined?(RubyVM.keep_script_lines)
+
       @tp_load_script = TracePoint.new(:script_compiled){|tp|
-        ThreadClient.current.on_load tp.instruction_sequence, tp.eval_script
+        eval_script = tp.eval_script unless @has_keep_script_lines
+        ThreadClient.current.on_load tp.instruction_sequence, eval_script
       }
       @tp_load_script.enable
 
       @thread_stopper = thread_stopper
       self.postmortem = CONFIG[:postmortem]
+
+      register_default_command
     end
 
     def active?
       !@q_evt.closed?
     end
 
-    def break_at? file, line
-      @bps.has_key? [file, line]
+    def remote?
+      @ui.remote?
+    end
+
+    def stop_stepping? file, line, subsession_id = nil
+      if @bps.has_key? [file, line]
+        true
+      elsif subsession_id && @subsession_id != subsession_id
+        true
+      else
+        false
+      end
     end
 
     def activate ui = nil, on_fork: false
       @ui = ui if ui
 
       @tp_thread_begin&.disable
+      @tp_thread_end&.disable
       @tp_thread_begin = nil
-
+      @tp_thread_end = nil
       @ui.activate self, on_fork: on_fork
 
       q = Queue.new
+      first_q = Queue.new
       @session_server = Thread.new do
+        # make sure `@session_server` is assigned
+        first_q.pop; first_q = nil
+
         Thread.current.name = 'DEBUGGER__::SESSION@server'
         Thread.current.abort_on_exception = true
 
@@ -168,10 +197,21 @@ module DEBUGGER__
         end
         @tp_thread_begin.enable
 
+        @tp_thread_end = TracePoint.new(:thread_end) do |tp|
+          @th_clients.delete(Thread.current)
+        end
+        @tp_thread_end.enable
+
+        if CONFIG[:irb_console] && !CONFIG[:open]
+          require_relative "irb_integration"
+          thc.activate_irb_integration
+        end
+
         # session start
         q << true
         session_server_main
       end
+      first_q << :ok
 
       q.pop
     end
@@ -181,6 +221,7 @@ module DEBUGGER__
       @thread_stopper.disable
       @tp_load_script.disable
       @tp_thread_begin.disable
+      @tp_thread_end.disable
       @bps.each_value{|bp| bp.disable}
       @th_clients.each_value{|thc| thc.close}
       @tracers.values.each{|t| t.disable}
@@ -192,6 +233,16 @@ module DEBUGGER__
     def reset_ui ui
       @ui.deactivate
       @ui = ui
+
+      # activate new ui
+      @tp_thread_begin.disable
+      @tp_thread_end.disable
+      @ui.activate self
+      if @ui.respond_to?(:reader_thread) && thc = get_thread_client(@ui.reader_thread)
+        thc.mark_as_management
+      end
+      @tp_thread_begin.enable
+      @tp_thread_end.enable
     end
 
     def pop_event
@@ -210,20 +261,35 @@ module DEBUGGER__
       @tc << req
     end
 
+    def request_tc_with_restarted_threads(req)
+      restart_all_threads
+      request_tc(req)
+    end
+
+    def request_eval type, src
+      request_tc_with_restarted_threads [:eval, type, src]
+    end
+
     def process_event evt
       # variable `@internal_info` is only used for test
-      @tc, output, ev, @internal_info, *ev_args = evt
+      tc, output, ev, @internal_info, *ev_args = evt
 
       output.each{|str| @ui.puts str} if ev != :suspend
 
-      case ev
-
-      when :thread_begin # special event, tc is nil
+      # special event, tc is nil
+      # and we don't want to set @tc to the newly created thread's ThreadClient
+      if ev == :thread_begin
         th = ev_args.shift
         q = ev_args.shift
         on_thread_begin th
         q << true
 
+        return
+      end
+
+      @tc = tc
+
+      case ev
       when :init
         enter_subsession
         wait_command_loop
@@ -241,7 +307,7 @@ module DEBUGGER__
 
       when :suspend
         enter_subsession if ev_args.first != :replay
-        output.each{|str| @ui.puts str}
+        output.each{|str| @ui.puts str} unless @ui.ignore_output_on_suspend?
 
         case ev_args.first
         when :breakpoint
@@ -262,7 +328,7 @@ module DEBUGGER__
         if @displays.empty?
           wait_command_loop
         else
-          request_tc [:eval, :display, @displays]
+          request_eval :display, @displays
         end
       when :result
         raise "[BUG] not in subsession" if @subsession_stack.empty?
@@ -277,6 +343,7 @@ module DEBUGGER__
             end
           end
 
+          stop_all_threads
         when :method_breakpoint, :watch_breakpoint
           bp = ev_args[1]
           if bp
@@ -290,17 +357,15 @@ module DEBUGGER__
           obj_inspect = ev_args[2]
           opt = ev_args[3]
           add_tracer ObjectTracer.new(@ui, obj_id, obj_inspect, **opt)
+          stop_all_threads
         else
-          # ignore
+          stop_all_threads
         end
 
         wait_command_loop
 
-      when :dap_result
-        dap_event ev_args # server.rb
-        wait_command_loop
-      when :cdp_result
-        cdp_event ev_args
+      when :protocol_result
+        process_protocol_result ev_args
         wait_command_loop
       end
     end
@@ -316,7 +381,7 @@ module DEBUGGER__
       if @preset_command && !@preset_command.commands.empty?
         @preset_command.commands += cs
       else
-        @preset_command = PresetCommand.new(cs, name, continue)
+        @preset_command = PresetCommands.new(cs, name, continue)
       end
 
       ThreadClient.current.on_init name if kick
@@ -389,97 +454,121 @@ module DEBUGGER__
       end
     end
 
-    def process_command line
-      if line.empty?
-        if @repl_prev_line
-          line = @repl_prev_line
-        else
-          return :retry
-        end
-      else
-        @repl_prev_line = line
-      end
+    private def register_command *names,
+                                 repeat: false, unsafe: true, cancel_auto_continue: false, postmortem: true,
+                                 &b
+      cmd = SessionCommand.new(b, repeat, unsafe, cancel_auto_continue, postmortem)
 
-      /([^\s]+)(?:\s+(.+))?/ =~ line
-      cmd, arg = $1, $2
-
-      # p cmd: [cmd, *arg]
+      names.each{|name|
+        @commands[name] = cmd
+      }
+    end
 
-      case cmd
+    def register_default_command
       ### Control flow
 
       # * `s[tep]`
       #   * Step in. Resume the program until next breakable point.
       # * `s[tep] <n>`
       #   * Step in, resume the program at `<n>`th breakable point.
-      when 's', 'step'
-        cancel_auto_continue
-        check_postmortem
+      register_command 's', 'step',
+                       repeat: true,
+                       cancel_auto_continue: true,
+                       postmortem: false do |arg|
         step_command :in, arg
+      end
 
       # * `n[ext]`
       #   * Step over. Resume the program until next line.
       # * `n[ext] <n>`
       #   * Step over, same as `step <n>`.
-      when 'n', 'next'
-        cancel_auto_continue
-        check_postmortem
+      register_command 'n', 'next',
+                       repeat: true,
+                       cancel_auto_continue: true,
+                       postmortem: false do |arg|
         step_command :next, arg
+      end
 
       # * `fin[ish]`
       #   * Finish this frame. Resume the program until the current frame is finished.
       # * `fin[ish] <n>`
       #   * Finish `<n>`th frames.
-      when 'fin', 'finish'
-        cancel_auto_continue
-        check_postmortem
-
+      register_command 'fin', 'finish',
+                       repeat: true,
+                       cancel_auto_continue: true,
+                       postmortem: false do |arg|
         if arg&.to_i == 0
           raise 'finish command with 0 does not make sense.'
         end
 
         step_command :finish, arg
+      end
 
-      # * `c[ontinue]`
+      # * `u[ntil]`
+      #   * Similar to `next` command, but only stop later lines or the end of the current frame.
+      #   * Similar to gdb's `advance` command.
+      # * `u[ntil] <[file:]line>`
+      #   * Run til the program reaches given location or the end of the current frame.
+      # * `u[ntil] <name>`
+      #   * Run til the program invokes a method `<name>`. `<name>` can be a regexp with `/name/`.
+      register_command 'u', 'until',
+                       repeat: true,
+                       cancel_auto_continue: true,
+                       postmortem: false do |arg|
+
+        step_command :until, arg
+      end
+
+      # * `c` or `cont` or `continue`
       #   * Resume the program.
-      when 'c', 'continue'
-        cancel_auto_continue
+      register_command 'c', 'cont', 'continue',
+                       repeat: true,
+                       cancel_auto_continue: true do |arg|
         leave_subsession :continue
+      end
 
       # * `q[uit]` or `Ctrl-D`
       #   * Finish debugger (with the debuggee process on non-remote debugging).
-      when 'q', 'quit'
+      register_command 'q', 'quit' do |arg|
         if ask 'Really quit?'
-          @ui.quit arg.to_i
+          @ui.quit arg.to_i do
+            request_tc :quit
+          end
           leave_subsession :continue
         else
-          return :retry
+          next :retry
         end
+      end
 
       # * `q[uit]!`
       #   * Same as q[uit] but without the confirmation prompt.
-      when 'q!', 'quit!'
-        @ui.quit arg.to_i
-        leave_subsession nil
+      register_command 'q!', 'quit!', unsafe: false do |arg|
+        @ui.quit arg.to_i do
+          request_tc :quit
+        end
+        leave_subsession :continue
+      end
 
       # * `kill`
       #   * Stop the debuggee process with `Kernel#exit!`.
-      when 'kill'
+      register_command 'kill' do |arg|
         if ask 'Really kill?'
           exit! (arg || 1).to_i
         else
-          return :retry
+          next :retry
         end
+      end
 
       # * `kill!`
       #   * Same as kill but without the confirmation prompt.
-      when 'kill!'
+      register_command 'kill!', unsafe: false do |arg|
         exit! (arg || 1).to_i
+      end
 
       # * `sigint`
       #   * Execute SIGINT handler registered by the debuggee.
       #   * Note that this command should be used just after stop by `SIGINT`.
-      when 'sigint'
+      register_command 'sigint' do
         begin
           case cmd = @intercepted_sigint_cmd
           when nil, 'IGNORE', :IGNORE, 'DEFAULT', :DEFAULT
@@ -495,8 +584,9 @@ module DEBUGGER__
         rescue Exception => e
           @ui.puts "Exception: #{e}"
           @ui.puts e.backtrace.map{|line| "  #{e}"}
-          return :retry
+          next :retry
         end
+      end
 
       ### Breakpoint
 
@@ -521,22 +611,21 @@ module DEBUGGER__
       # * `b[reak] if: <expr>`
       #   * break if: `<expr>` is true at any lines.
       #   * Note that this feature is super slow.
-      when 'b', 'break'
-        check_postmortem
-
+      register_command 'b', 'break', postmortem: false, unsafe: false do |arg|
         if arg == nil
           show_bps
-          return :retry
+          next :retry
         else
           case bp = repl_add_breakpoint(arg)
           when :noretry
           when nil
-            return :retry
+            next :retry
           else
             show_bps bp
-            return :retry
+            next :retry
           end
         end
+      end
 
       # * `catch <Error>`
       #   * Set breakpoint on raising `<Error>`.
@@ -548,16 +637,16 @@ module DEBUGGER__
       #   * stops and run `<command>`, and continue.
       # * `catch ... path: <path>`
       #   * stops if the exception is raised from a `<path>`. `<path>` can be a regexp with `/regexp/`.
-      when 'catch'
-        check_postmortem
-
+      register_command 'catch', postmortem: false, unsafe: false do |arg|
         if arg
           bp = repl_add_catch_breakpoint arg
           show_bps bp if bp
         else
           show_bps
         end
-        return :retry
+
+        :retry
+      end
 
       # * `watch @ivar`
       #   * Stop the execution when the result of current scope's `@ivar` is changed.
@@ -570,24 +659,20 @@ module DEBUGGER__
       #   * stops and run `<command>`, and continue.
       # * `watch ... path: <path>`
       #   * stops if the path matches `<path>`. `<path>` can be a regexp with `/regexp/`.
-      when 'wat', 'watch'
-        check_postmortem
-
+      register_command 'wat', 'watch', postmortem: false, unsafe: false do |arg|
         if arg && arg.match?(/\A@\w+/)
           repl_add_watch_breakpoint(arg)
         else
           show_bps
-          return :retry
+          :retry
         end
+      end
 
       # * `del[ete]`
       #   * delete all breakpoints.
       # * `del[ete] <bpnum>`
       #   * delete specified breakpoint.
-      when 'del', 'delete'
-        check_postmortem
-
-        bp =
+      register_command 'del', 'delete', postmortem: false, unsafe: false do |arg|
         case arg
         when nil
           show_bps
@@ -595,12 +680,13 @@ module DEBUGGER__
             delete_bp
           end
         when /\d+/
-          delete_bp arg.to_i
+          bp = delete_bp arg.to_i
         else
           nil
         end
         @ui.puts "deleted: \##{bp[0]} #{bp[1]}" if bp
-        return :retry
+        :retry
+      end
 
       ### Information
 
@@ -612,19 +698,20 @@ module DEBUGGER__
       #   * Only shows frames with method name or location info that matches `/regexp/`.
       # * `bt <num> /regexp/` or `backtrace <num> /regexp/`
       #   * Only shows first `<num>` frames with method name or location info that matches `/regexp/`.
-      when 'bt', 'backtrace'
+      register_command 'bt', 'backtrace', unsafe: false do |arg|
         case arg
         when /\A(\d+)\z/
-          request_tc [:show, :backtrace, arg.to_i, nil]
+          request_tc_with_restarted_threads [:show, :backtrace, arg.to_i, nil]
         when /\A\/(.*)\/\z/
           pattern = $1
-          request_tc [:show, :backtrace, nil, Regexp.compile(pattern)]
+          request_tc_with_restarted_threads [:show, :backtrace, nil, Regexp.compile(pattern)]
         when /\A(\d+)\s+\/(.*)\/\z/
           max, pattern = $1, $2
-          request_tc [:show, :backtrace, max.to_i, Regexp.compile(pattern)]
+          request_tc_with_restarted_threads [:show, :backtrace, max.to_i, Regexp.compile(pattern)]
         else
-          request_tc [:show, :backtrace, nil, nil]
+          request_tc_with_restarted_threads [:show, :backtrace, nil, nil]
         end
+      end
 
       # * `l[ist]`
       #   * Show current frame's source code.
@@ -633,7 +720,7 @@ module DEBUGGER__
       #   * Show predecessor lines as opposed to the `list` command.
       # * `l[ist] <start>` or `l[ist] <start>-<end>`
       #   * Show current frame's source code from the line <start> to <end> if given.
-      when 'l', 'list'
+      register_command 'l', 'list', repeat: true, unsafe: false do |arg|
         case arg ? arg.strip : nil
         when /\A(\d+)\z/
           request_tc [:show, :list, {start_line: arg.to_i - 1}]
@@ -645,45 +732,63 @@ module DEBUGGER__
           request_tc [:show, :list]
         else
           @ui.puts "Can not handle list argument: #{arg}"
-          return :retry
+          :retry
         end
+      end
+
+      # * `whereami`
+      #   * Show the current frame with source code.
+      register_command 'whereami', unsafe: false do
+        request_tc [:show, :whereami]
+      end
 
       # * `edit`
       #   * Open the current file on the editor (use `EDITOR` environment variable).
       #   * Note that edited file will not be reloaded.
       # * `edit <file>`
       #   * Open <file> on the editor.
-      when 'edit'
+      register_command 'edit' do |arg|
         if @ui.remote?
           @ui.puts "not supported on the remote console."
-          return :retry
+          next :retry
         end
 
         begin
           arg = resolve_path(arg) if arg
         rescue Errno::ENOENT
           @ui.puts "not found: #{arg}"
-          return :retry
+          next :retry
         end
 
         request_tc [:show, :edit, arg]
+      end
+
+      info_subcommands = nil
+      info_subcommands_abbrev = nil
 
       # * `i[nfo]`
-      #    * Show information about current frame (local/instance variables and defined constants).
-      # * `i[nfo] l[ocal[s]]`
+      #   * Show information about current frame (local/instance variables and defined constants).
+      # * `i[nfo]` <subcommand>
+      #   * `info` has the following sub-commands.
+      #   * Sub-commands can be specified with few letters which is unambiguous, like `l` for 'locals'.
+      # * `i[nfo] l or locals or local_variables`
       #   * Show information about the current frame (local variables)
-      #   * It includes `self` as `%self` and a return value as `%return`.
-      # * `i[nfo] i[var[s]]` or `i[nfo] instance`
+      #   * It includes `self` as `%self` and a return value as `_return`.
+      # * `i[nfo] i or ivars or instance_variables`
       #   * Show information about instance variables about `self`.
-      # * `i[nfo] c[onst[s]]` or `i[nfo] constant[s]`
+      #   * `info ivars <expr>` shows the instance variables of the result of `<expr>`.
+      # * `i[nfo] c or consts or constants`
       #   * Show information about accessible constants except toplevel constants.
-      # * `i[nfo] g[lobal[s]]`
+      #   * `info consts <expr>` shows the constants of a class/module of the result of `<expr>`
+      # * `i[nfo] g or globals or global_variables`
       #   * Show information about global variables
+      # * `i[nfo] th or threads`
+      #   * Show all threads (same as `th[read]`).
+      # * `i[nfo] b or breakpoints or w or watchpoints`
+      #   * Show all breakpoints and watchpoints.
       # * `i[nfo] ... /regexp/`
       #   * Filter the output with `/regexp/`.
-      # * `i[nfo] th[read[s]]`
-      #   * Show all threads (same as `th[read]`).
-      when 'i', 'info'
+      register_command 'i', 'info', unsafe: false do |arg|
         if /\/(.+)\/\z/ =~ arg
           pat = Regexp.compile($1)
           sub = $~.pre_match.strip
@@ -691,63 +796,98 @@ module DEBUGGER__
           sub = arg
         end
 
+        if /\A(.+?)\b(.+)/ =~ sub
+          sub = $1
+          opt = $2.strip
+          opt = nil if opt.empty?
+        end
+
+        if sub && !info_subcommands
+          info_subcommands = {
+            locals: %w[ locals local_variables ],
+            ivars:  %w[ ivars instance_variables ],
+            consts: %w[ consts constants ],
+            globals:%w[ globals global_variables ],
+            threads:%w[ threads ],
+            breaks: %w[ breakpoints ],
+            watchs: %w[ watchpoints ],
+          }
+
+          require_relative 'abbrev_command'
+          info_subcommands_abbrev = AbbrevCommand.new(info_subcommands)
+        end
+
+        if sub
+          sub = info_subcommands_abbrev.search sub, :unknown do |candidates|
+            # note: unreached now
+            @ui.puts "Ambiguous command '#{sub}': #{candidates.join(' ')}"
+          end
+        end
+
         case sub
         when nil
-          request_tc [:show, :default, pat] # something useful
-        when 'l', /^locals?/
-          request_tc [:show, :locals, pat]
-        when 'i', /^ivars?/i, /^instance[_ ]variables?/i
-          request_tc [:show, :ivars, pat]
-        when 'c', /^consts?/i, /^constants?/i
-          request_tc [:show, :consts, pat]
-        when 'g', /^globals?/i, /^global[_ ]variables?/i
-          request_tc [:show, :globals, pat]
-        when 'th', /threads?/
+          request_tc_with_restarted_threads [:show, :default, pat] # something useful
+        when :locals
+          request_tc_with_restarted_threads [:show, :locals, pat]
+        when :ivars
+          request_tc_with_restarted_threads [:show, :ivars, pat, opt]
+        when :consts
+          request_tc_with_restarted_threads [:show, :consts, pat, opt]
+        when :globals
+          request_tc_with_restarted_threads [:show, :globals, pat]
+        when :threads
           thread_list
-          return :retry
+          :retry
+        when :breaks, :watchs
+          show_bps
+          :retry
         else
           @ui.puts "unrecognized argument for info command: #{arg}"
           show_help 'info'
-          return :retry
+          :retry
         end
+      end
 
       # * `o[utline]` or `ls`
       #   * Show you available methods, constants, local variables, and instance variables in the current scope.
       # * `o[utline] <expr>` or `ls <expr>`
       #   * Show you available methods and instance variables of the given object.
       #   * If the object is a class/module, it also lists its constants.
-      when 'outline', 'o', 'ls'
-        request_tc [:show, :outline, arg]
+      register_command 'outline', 'o', 'ls', unsafe: false do |arg|
+        request_tc_with_restarted_threads [:show, :outline, arg]
+      end
 
       # * `display`
       #   * Show display setting.
       # * `display <expr>`
       #   * Show the result of `<expr>` at every suspended timing.
-      when 'display'
+      register_command 'display', postmortem: false do |arg|
         if arg && !arg.empty?
           @displays << arg
-          request_tc [:eval, :try_display, @displays]
+          request_eval :try_display, @displays
         else
-          request_tc [:eval, :display, @displays]
+          request_eval :display, @displays
         end
+      end
 
       # * `undisplay`
       #   * Remove all display settings.
       # * `undisplay <displaynum>`
       #   * Remove a specified display setting.
-      when 'undisplay'
+      register_command 'undisplay', postmortem: false, unsafe: false do |arg|
         case arg
         when /(\d+)/
           if @displays[n = $1.to_i]
             @displays.delete_at n
           end
-          request_tc [:eval, :display, @displays]
+          request_eval :display, @displays
         when nil
           if ask "clear all?", 'N'
             @displays.clear
           end
-          return :retry
+          :retry
         end
+      end
 
       ### Frame control
 
@@ -755,53 +895,58 @@ module DEBUGGER__
       #   * Show the current frame.
       # * `f[rame] <framenum>`
       #   * Specify a current frame. Evaluation are run on specified frame.
-      when 'frame', 'f'
+      register_command 'frame', 'f', unsafe: false do |arg|
         request_tc [:frame, :set, arg]
+      end
 
       # * `up`
       #   * Specify the upper frame.
-      when 'up'
+      register_command 'up', repeat: true, unsafe: false do |arg|
         request_tc [:frame, :up]
+      end
 
       # * `down`
       #   * Specify the lower frame.
-      when 'down'
+      register_command 'down', repeat: true, unsafe: false do |arg|
         request_tc [:frame, :down]
+      end
 
       ### Evaluate
 
       # * `p <expr>`
       #   * Evaluate like `p <expr>` on the current frame.
-      when 'p'
-        request_tc [:eval, :p, arg.to_s]
+      register_command 'p' do |arg|
+        request_eval :p, arg.to_s
+      end
 
       # * `pp <expr>`
       #   * Evaluate like `pp <expr>` on the current frame.
-      when 'pp'
-        request_tc [:eval, :pp, arg.to_s]
+      register_command 'pp' do |arg|
+        request_eval :pp, arg.to_s
+      end
 
       # * `eval <expr>`
       #   * Evaluate `<expr>` on the current frame.
-      when 'eval', 'call'
+      register_command 'eval', 'call' do |arg|
         if arg == nil || arg.empty?
           show_help 'eval'
           @ui.puts "\nTo evaluate the variable `#{cmd}`, use `pp #{cmd}` instead."
-          return :retry
+          :retry
         else
-          request_tc [:eval, :call, arg]
+          request_eval :call, arg
         end
+      end
 
       # * `irb`
       #   * Invoke `irb` on the current frame.
-      when 'irb'
+      register_command 'irb' do |arg|
         if @ui.remote?
-          @ui.puts "not supported on the remote console."
-          return :retry
+          @ui.puts "\nIRB is not supported on the remote console."
+          :retry
+        else
+          request_eval :irb, nil
         end
-        request_tc [:eval, :irb]
-
-        # don't repeat irb command
-        @repl_prev_line = nil
+      end
 
       ### Trace
       # * `trace`
@@ -822,7 +967,7 @@ module DEBUGGER__
       #   * Disable tracer specified by `<num>` (use `trace` command to check the numbers).
       # * `trace off [line|call|pass]`
       #   * Disable all tracers. If `<type>` is provided, disable specified type tracers.
-      when 'trace'
+      register_command 'trace', postmortem: false, unsafe: false do |arg|
         if (re = /\s+into:\s*(.+)/) =~ arg
           into = $1
           arg.sub!(re, '')
@@ -840,22 +985,22 @@ module DEBUGGER__
             @ui.puts "* \##{i} #{t}"
           }
           @ui.puts
-          return :retry
+          :retry
 
         when /\Aline\z/
           add_tracer LineTracer.new(@ui, pattern: pattern, into: into)
-          return :retry
+          :retry
 
         when /\Acall\z/
           add_tracer CallTracer.new(@ui, pattern: pattern, into: into)
-          return :retry
+          :retry
 
         when /\Aexception\z/
           add_tracer ExceptionTracer.new(@ui, pattern: pattern, into: into)
-          return :retry
+          :retry
 
         when /\Aobject\s+(.+)/
-          request_tc [:trace, :object, $1.strip, {pattern: pattern, into: into}]
+          request_tc_with_restarted_threads [:trace, :object, $1.strip, {pattern: pattern, into: into}]
 
         when /\Aoff\s+(\d+)\z/
           if t = @tracers.values[$1.to_i]
@@ -864,7 +1009,7 @@ module DEBUGGER__
           else
             @ui.puts "Unmatched: #{$1}"
           end
-          return :retry
+          :retry
 
         when /\Aoff(\s+(line|call|exception|object))?\z/
           @tracers.values.each{|t|
@@ -873,12 +1018,13 @@ module DEBUGGER__
               @ui.puts "Disable #{t.to_s}"
             end
           }
-          return :retry
+          :retry
 
         else
           @ui.puts "Unknown trace option: #{arg.inspect}"
-          return :retry
+          :retry
         end
+      end
 
       # Record
       # * `record`
@@ -890,14 +1036,15 @@ module DEBUGGER__
       #   * `s[tep]` does stepping forward with the last log.
       # * `step reset`
       #   * Stop replay .
-      when 'record'
+      register_command 'record', postmortem: false, unsafe: false do |arg|
         case arg
         when nil, 'on', 'off'
           request_tc [:record, arg&.to_sym]
         else
           @ui.puts "unknown command: #{arg}"
-          return :retry
+          :retry
         end
+      end
 
       ### Thread control
 
@@ -905,7 +1052,7 @@ module DEBUGGER__
       #   * Show all threads.
       # * `th[read] <thnum>`
       #   * Switch thread specified by `<thnum>`.
-      when 'th', 'thread'
+      register_command 'th', 'thread', unsafe: false do |arg|
         case arg
         when nil, 'list', 'l'
           thread_list
@@ -914,7 +1061,8 @@ module DEBUGGER__
         else
           @ui.puts "unknown thread command: #{arg}"
         end
-        return :retry
+        :retry
+      end
 
       ### Configuration
       # * `config`
@@ -927,13 +1075,14 @@ module DEBUGGER__
       #   * Append `<val>` to `<name>` if it is an array.
       # * `config unset <name>`
       #   * Set <name> to default.
-      when 'config'
+      register_command 'config', unsafe: false do |arg|
         config_command arg
-        return :retry
+        :retry
+      end
 
       # * `source <file>`
       #   * Evaluate lines in `<file>` as debug commands.
-      when 'source'
+      register_command 'source' do |arg|
         if arg
           begin
             cmds = File.readlines(path = File.expand_path(arg))
@@ -944,7 +1093,8 @@ module DEBUGGER__
         else
           show_help 'source'
         end
-        return :retry
+        :retry
+      end
 
       # * `open`
       #   * open debuggee port on UNIX domain socket and wait for attaching.
@@ -955,26 +1105,28 @@ module DEBUGGER__
       #   * open debuggee port for VSCode and launch VSCode if available.
       # * `open chrome`
       #   * open debuggee port for Chrome and wait for attaching.
-      when 'open'
+      register_command 'open' do |arg|
         case arg&.downcase
         when '', nil
-          repl_open
-        when 'vscode'
-          repl_open_vscode
-        when /\A(.+):(\d+)\z/
-          repl_open_tcp $1, $2.to_i
+          ::DEBUGGER__.open nonstop: true
         when /\A(\d+)z/
-          repl_open_tcp nil, $1.to_i
+          ::DEBUGGER__.open_tcp host: nil, port: $1.to_i, nonstop: true
+        when /\A(.+):(\d+)\z/
+          ::DEBUGGER__.open_tcp host: $1, port: $2.to_i, nonstop: true
         when 'tcp'
-          repl_open_tcp CONFIG[:host], (CONFIG[:port] || 0)
+          ::DEBUGGER__.open_tcp host: CONFIG[:host], port: (CONFIG[:port] || 0), nonstop: true
+        when 'vscode'
+          CONFIG[:open] = 'vscode'
+          ::DEBUGGER__.open nonstop: true
         when 'chrome', 'cdp'
-          CONFIG[:open_frontend] = 'chrome'
-          repl_open_tcp CONFIG[:host], (CONFIG[:port] || 0)
+          CONFIG[:open] = 'chrome'
+          ::DEBUGGER__.open_tcp host: CONFIG[:host], port: (CONFIG[:port] || 0), nonstop: true
         else
           raise "Unknown arg: #{arg}"
         end
 
-        return :retry
+        :retry
+      end
 
       ### Help
 
@@ -982,26 +1134,38 @@ module DEBUGGER__
       #   * Show help for all commands.
       # * `h[elp] <command>`
       #   * Show help for the given command.
-      when 'h', 'help', '?'
+      register_command 'h', 'help', '?', unsafe: false do |arg|
         show_help arg
-        return :retry
+        :retry
+      end
+    end
 
-      ### END
+    def process_command line
+      if line.empty?
+        if @repl_prev_line
+          line = @repl_prev_line
+        else
+          return :retry
+        end
+      else
+        @repl_prev_line = line
+      end
+
+      /([^\s]+)(?:\s+(.+))?/ =~ line
+      cmd_name, cmd_arg = $1, $2
+
+      if cmd = @commands[cmd_name]
+        check_postmortem      if !cmd.postmortem
+        check_unsafe          if cmd.unsafe
+        cancel_auto_continue  if cmd.cancel_auto_continue
+        @repl_prev_line = nil if !cmd.repeat
+
+        cmd.block.call(cmd_arg)
       else
-        request_tc [:eval, :pp, line]
-=begin
         @repl_prev_line = nil
-        @ui.puts "unknown command: #{line}"
-        begin
-          require 'did_you_mean'
-          spell_checker = DidYouMean::SpellChecker.new(dictionary: DEBUGGER__.commands)
-          correction = spell_checker.correct(line.split(/\s/).first || '')
-          @ui.puts "Did you mean? #{correction.join(' or ')}" unless correction.empty?
-        rescue LoadError
-          # Don't use D
-        end
-        return :retry
-=end
+        check_unsafe
+
+        request_eval :pp, line
       end
 
     rescue Interrupt
@@ -1017,31 +1181,12 @@ module DEBUGGER__
       return :retry
     end
 
-    def repl_open_setup
-      @tp_thread_begin.disable
-      @ui.activate self
-      if @ui.respond_to?(:reader_thread) && thc = get_thread_client(@ui.reader_thread)
-        thc.mark_as_management
+    def step_command type, arg
+      if type == :until
+        leave_subsession [:step, type, arg]
+        return
       end
-      @tp_thread_begin.enable
-    end
-
-    def repl_open_tcp host, port, **kw
-      DEBUGGER__.open_tcp host: host, port: port, nonstop: true, **kw
-      repl_open_setup
-    end
-
-    def repl_open
-      DEBUGGER__.open nonstop: true
-      repl_open_setup
-    end
-
-    def repl_open_vscode
-      CONFIG[:open_frontend] = 'vscode'
-      repl_open
-    end
 
-    def step_command type, arg
       case arg
       when nil, /\A\d+\z/
         if type == :in && @tc.recorder&.replaying?
@@ -1049,12 +1194,14 @@ module DEBUGGER__
         else
           leave_subsession [:step, type, arg&.to_i]
         end
-      when /\Aback\z/, /\Areset\z/
+      when /\A(back)\z/, /\A(back)\s+(\d+)\z/, /\A(reset)\z/
         if type != :in
           @ui.puts "only `step #{arg}` is supported."
           :retry
         else
-          request_tc [:step, arg.to_sym]
+          type = $1.to_sym
+          iter = $2&.to_i
+          request_tc [:step, type, iter]
         end
       else
         @ui.puts "Unknown option: #{arg}"
@@ -1248,8 +1395,6 @@ module DEBUGGER__
 
     def add_bp bp
       # don't repeat commands that add breakpoints
-      @repl_prev_line = nil
-
       if @bps.has_key? bp.key
         if bp.duplicable?
           bp
@@ -1281,7 +1426,7 @@ module DEBUGGER__
 
     BREAK_KEYWORDS = %w(if: do: pre: path:).freeze
 
-    def parse_break arg
+    private def parse_break type, arg
       mode = :sig
       expr = Hash.new{|h, k| h[k] = []}
       arg.split(' ').each{|w|
@@ -1298,13 +1443,18 @@ module DEBUGGER__
         expr[:path] = Regexp.compile($1)
       end
 
+      if expr[:do] || expr[:pre]
+        check_unsafe
+        expr[:cmd] = [type, expr[:pre], expr[:do]]
+      end
+
       expr
     end
 
     def repl_add_breakpoint arg
-      expr = parse_break arg.strip
+      expr = parse_break 'break', arg.strip
       cond = expr[:if]
-      cmd = ['break', expr[:pre], expr[:do]] if expr[:pre] || expr[:do]
+      cmd  = expr[:cmd]
       path = expr[:path]
 
       case expr[:sig]
@@ -1325,9 +1475,9 @@ module DEBUGGER__
     end
 
     def repl_add_catch_breakpoint arg
-      expr = parse_break arg.strip
+      expr = parse_break 'catch', arg.strip
       cond = expr[:if]
-      cmd = ['catch', expr[:pre], expr[:do]] if expr[:pre] || expr[:do]
+      cmd  = expr[:cmd]
       path = expr[:path]
 
       bp = CatchBreakpoint.new(expr[:sig], cond: cond, command: cmd, path: path)
@@ -1335,9 +1485,9 @@ module DEBUGGER__
     end
 
     def repl_add_watch_breakpoint arg
-      expr = parse_break arg.strip
+      expr = parse_break 'watch', arg.strip
       cond = expr[:if]
-      cmd = ['watch', expr[:pre], expr[:do]] if expr[:pre] || expr[:do]
+      cmd  = expr[:cmd]
       path = Regexp.compile(expr[:path]) if expr[:path]
 
       request_tc [:breakpoint, :watch, expr[:sig], cond, cmd, path]
@@ -1374,7 +1524,7 @@ module DEBUGGER__
     def clear_line_breakpoints path
       path = resolve_path(path)
       clear_breakpoints do |k, bp|
-        bp.is_a?(LineBreakpoint) && DEBUGGER__.compare_path(k.first, path)
+        bp.is_a?(LineBreakpoint) && bp.path_is?(path)
       end
     rescue Errno::ENOENT
       # just ignore
@@ -1398,9 +1548,7 @@ module DEBUGGER__
     # tracers
 
     def add_tracer tracer
-      # don't repeat commands that add tracers
-      @repl_prev_line = nil
-      if @tracers.has_key? tracer.key
+      if @tracers[tracer.key]&.enabled?
         tracer.disable
         @ui.puts "Duplicated tracer: #{tracer}"
       else
@@ -1557,10 +1705,11 @@ module DEBUGGER__
     end
 
     private def enter_subsession
+      @subsession_id += 1
       if !@subsession_stack.empty?
-        DEBUGGER__.info "Enter subsession (nested #{@subsession_stack.size})"
+        DEBUGGER__.debug{ "Enter subsession (nested #{@subsession_stack.size})" }
       else
-        DEBUGGER__.info "Enter subsession"
+        DEBUGGER__.debug{ "Enter subsession" }
         stop_all_threads
         @process_group.lock
       end
@@ -1573,11 +1722,11 @@ module DEBUGGER__
       @subsession_stack.pop
 
       if @subsession_stack.empty?
-        DEBUGGER__.info "Leave subsession"
+        DEBUGGER__.debug{ "Leave subsession" }
         @process_group.unlock
         restart_all_threads
       else
-        DEBUGGER__.info "Leave subsession (nested #{@subsession_stack.size})"
+        DEBUGGER__.debug{ "Leave subsession (nested #{@subsession_stack.size})" }
       end
 
       request_tc type if type
@@ -1599,25 +1748,30 @@ module DEBUGGER__
       file_path, reloaded = @sr.add(iseq, src)
       @ui.event :load, file_path, reloaded
 
-      pending_line_breakpoints = @bps.find_all do |key, bp|
-        LineBreakpoint === bp && !bp.iseq
-      end
+      # check breakpoints
+      if file_path
+        @bps.find_all do |_key, bp|
+          LineBreakpoint === bp && bp.path_is?(file_path) && (iseq.first_lineno..iseq.last_line).cover?(bp.line)
+        end.each do |_key, bp|
+          if !bp.iseq
+            bp.try_activate iseq
+          elsif reloaded
+            @bps.delete bp.key # to allow duplicate
 
-      pending_line_breakpoints.each do |_key, bp|
-        if DEBUGGER__.compare_path(bp.path, (iseq.absolute_path || iseq.path))
-          bp.try_activate iseq
-        end
-      end
+            # When we delete a breakpoint from the @bps hash, we also need to deactivate it or else its tracepoint event
+            # will continue to be enabled and we'll suspend on ghost breakpoints
+            bp.delete
 
-      if reloaded
-        @bps.find_all do |key, bp|
-          LineBreakpoint === bp && DEBUGGER__.compare_path(bp.path, file_path)
-        end.each do |_key, bp|
-          @bps.delete bp.key # to allow duplicate
-          if nbp = LineBreakpoint.copy(bp, iseq)
+            nbp = LineBreakpoint.copy(bp, iseq)
             add_bp nbp
           end
         end
+      else # !file_path => file_path is not existing
+        @bps.find_all do |_key, bp|
+          LineBreakpoint === bp && !bp.iseq && DEBUGGER__.compare_path(bp.path, (iseq.absolute_path || iseq.path))
+        end.each do |_key, bp|
+          bp.try_activate iseq
+        end
       end
     end
 
@@ -1716,6 +1870,12 @@ module DEBUGGER__
       end
     end
 
+    def check_unsafe
+      if @unsafe_context
+        raise RuntimeError, "#{@repl_prev_line.dump} is not allowed on unsafe context."
+      end
+    end
+
     def enter_postmortem_session exc
       return unless exc.instance_variable_defined? :@__debugger_postmortem_frames
 
@@ -1795,6 +1955,17 @@ module DEBUGGER__
       end
     end
 
+    def set_no_sigint_hook old, new
+      return unless old != new
+      return unless @ui.respond_to? :activate_sigint
+
+      if old # no -> yes
+        @ui.activate_sigint
+      else
+        @ui.deactivate_sigint
+      end
+    end
+
     def save_int_trap cmd
       prev, @intercepted_sigint_cmd = @intercepted_sigint_cmd, cmd
       prev
@@ -1838,6 +2009,13 @@ module DEBUGGER__
     def after_fork_parent
       @ui.after_fork_parent
     end
+
+    # experimental API
+    def extend_feature session: nil, thread_client: nil, ui: nil
+      Session.include session if session
+      ThreadClient.include thread_client if thread_client
+      @ui.extend ui if ui
+    end
   end
 
   class ProcessGroup
@@ -1886,9 +2064,11 @@ module DEBUGGER__
 
     def after_fork child: true
       if child || !@lock_file
-        @m = Mutex.new
-        @lock_level = 0
-        @lock_file = open(@lock_tempfile.path, 'w')
+        @m = Mutex.new unless @m
+        @m.synchronize do
+          @lock_level = 0
+          @lock_file = open(@lock_tempfile.path, 'w')
+        end
       end
     end
 
@@ -1897,7 +2077,7 @@ module DEBUGGER__
     end
 
     def locked?
-      # DEBUGGER__.info "locked? #{@lock_level}"
+      # DEBUGGER__.debug{ "locked? #{@lock_level}" }
       @lock_level > 0
     end
 
@@ -1982,6 +2162,10 @@ module DEBUGGER__
       end
     end
 
+    def ignore_output_on_suspend?
+      false
+    end
+
     def flush
     end
   end
@@ -2006,6 +2190,7 @@ module DEBUGGER__
       case loc.absolute_path
       when dir_prefix
       when %r{rubygems/core_ext/kernel_require\.rb}
+      when %r{bundled_gems\.rb}
       else
         return loc if loc.absolute_path
       end
@@ -2018,19 +2203,22 @@ module DEBUGGER__
   def self.start nonstop: false, **kw
     CONFIG.set_config(**kw)
 
-    unless defined? SESSION
-      require_relative 'local'
-      initialize_session{ UI_LocalConsole.new }
+    if CONFIG[:open]
+      open nonstop: nonstop, **kw
+    else
+      unless defined? SESSION
+        require_relative 'local'
+        initialize_session{ UI_LocalConsole.new }
+      end
+      setup_initial_suspend unless nonstop
     end
-
-    setup_initial_suspend unless nonstop
   end
 
   def self.open host: nil, port: CONFIG[:port], sock_path: nil, sock_dir: nil, nonstop: false, **kw
     CONFIG.set_config(**kw)
     require_relative 'server'
 
-    if port || CONFIG[:open_frontend] == 'chrome' || (!::Addrinfo.respond_to?(:unix))
+    if port || CONFIG[:open] == 'chrome' || (!::Addrinfo.respond_to?(:unix))
       open_tcp host: host, port: (port || 0), nonstop: nonstop
     else
       open_unix sock_path: sock_path, sock_dir: sock_dir, nonstop: nonstop
@@ -2092,6 +2280,18 @@ module DEBUGGER__
     end
   end
 
+  # Exiting control
+
+  class << self
+    def skip_all
+      @skip_all = true
+    end
+
+    def skip?
+      @skip_all
+    end
+  end
+
   def self.load_rc
     [[File.expand_path('~/.rdbgrc'), true],
      [File.expand_path('~/.rdbgrc.rb'), true],
@@ -2120,7 +2320,7 @@ module DEBUGGER__
   end
 
   # Inspector
-  
+
   SHORT_INSPECT_LENGTH = 40
 
   class LimitedPP
@@ -2191,6 +2391,7 @@ module DEBUGGER__
   def self.log level, msg
     if check_loglevel level
       @logfile = STDERR unless defined? @logfile
+      return if @logfile.closed?
 
       if defined? SESSION
         pi = SESSION.process_info
@@ -2222,7 +2423,7 @@ module DEBUGGER__
     # depend on the file system. So this check is only roughly estimation.
 
     def self.compare_path(a, b)
-      a.downcase == b.downcase
+      a&.downcase == b&.downcase
     end
   else
     def self.compare_path(a, b)
@@ -2273,8 +2474,24 @@ module DEBUGGER__
       end
     end
 
-    private def __fork_setup_for_debugger
-      fork_mode = CONFIG[:fork_mode]
+    module DaemonInterceptor
+      def daemon(*args)
+        return super unless defined?(SESSION) && SESSION.active?
+
+        _, child_hook = __fork_setup_for_debugger(:child)
+
+        unless SESSION.remote?
+          DEBUGGER__.warn "Can't debug the code after Process.daemon locally. Use the remote debugging feature."
+        end
+
+        super.tap do
+          child_hook.call
+        end
+      end
+    end
+
+    private def __fork_setup_for_debugger fork_mode = nil
+      fork_mode ||= CONFIG[:fork_mode]
 
       if fork_mode == :both && CONFIG[:parent_on_fork]
         fork_mode = :parent
@@ -2289,19 +2506,19 @@ module DEBUGGER__
           # Do nothing
         }
         child_hook = -> {
-          DEBUGGER__.warn "Detaching after fork from child process #{Process.pid}"
+          DEBUGGER__.info "Detaching after fork from child process #{Process.pid}"
           SESSION.deactivate
         }
       when :child
         SESSION.before_fork false
 
         parent_hook = -> child_pid {
-          DEBUGGER__.warn "Detaching after fork from parent process #{Process.pid}"
+          DEBUGGER__.info "Detaching after fork from parent process #{Process.pid}"
           SESSION.after_fork_parent
           SESSION.deactivate
         }
         child_hook = -> {
-          DEBUGGER__.warn "Attaching after process #{parent_pid} fork to child process #{Process.pid}"
+          DEBUGGER__.info "Attaching after process #{parent_pid} fork to child process #{Process.pid}"
           SESSION.activate on_fork: true
         }
       when :both
@@ -2312,7 +2529,7 @@ module DEBUGGER__
           SESSION.after_fork_parent
         }
         child_hook = -> {
-          DEBUGGER__.warn "Attaching after process #{parent_pid} fork to child process #{Process.pid}"
+          DEBUGGER__.info "Attaching after process #{parent_pid} fork to child process #{Process.pid}"
           SESSION.process_group.after_fork child: true
           SESSION.activate on_fork: true
         }
@@ -2324,7 +2541,17 @@ module DEBUGGER__
 
   module TrapInterceptor
     def trap sig, *command, &command_proc
-      case sig&.to_sym
+      sym =
+        case sig
+        when String
+          sig.to_sym
+        when Integer
+          Signal.signame(sig)&.to_sym
+        else
+          sig
+        end
+
+      case sym
       when :INT, :SIGINT
         if defined?(SESSION) && SESSION.active? && SESSION.intercept_trap_sigint?
           return SESSION.save_int_trap(command.empty? ? command_proc : command.first)
@@ -2339,6 +2566,7 @@ module DEBUGGER__
     module ::Process
       class << self
         prepend ForkInterceptor
+        prepend DaemonInterceptor
       end
     end
 
@@ -2374,6 +2602,7 @@ module DEBUGGER__
     module ::Process
       class << self
         prepend ForkInterceptor
+        prepend DaemonInterceptor
       end
     end
   end
@@ -2390,10 +2619,17 @@ module Kernel
     return if !defined?(::DEBUGGER__::SESSION) || !::DEBUGGER__::SESSION.active?
 
     if pre || (do_expr = binding.local_variable_get(:do))
-      cmds = ['binding.break', pre, do_expr]
+      cmds = ['#debugger', pre, do_expr]
     end
 
-    loc = caller_locations(up_level, 1).first; ::DEBUGGER__.add_line_breakpoint loc.path, loc.lineno + 1, oneshot: true, command: cmds
+    if ::DEBUGGER__::SESSION.in_subsession?
+      if cmds
+        commands = [*cmds[1], *cmds[2]].map{|c| c.split(';;').join("\n")}
+        ::DEBUGGER__::SESSION.add_preset_commands cmds[0], commands, kick: false, continue: false
+      end
+    else
+      loc = caller_locations(up_level, 1).first; ::DEBUGGER__.add_line_breakpoint loc.path, loc.lineno + 1, oneshot: true, command: cmds
+    end
     self
   end