kward 0.72.0 → 0.73.1

data/lib/kward/prompt_interface/editor/modes/modern.rb

@@ -43,7 +43,7 @@ module Kward
           modern_record_undo { editor_insert_tab unless editor_search_active? }
         when "\b", "\x7F"
           editor_search_active? ? editor_search_delete_character : modern_record_undo { modern_delete_before_cursor }
-        when "\x03"
+        when TerminalKeys::CTRL_C
           return editor_search_cancel if editor_search_active?
         when "\e"
           return editor_search_cancel if editor_search_active?
@@ -55,11 +55,13 @@ module Kward
         when "?"
           clear_editor_selection_before_edit unless editor_search_active?
           editor_search_active? ? editor_search_append(key) : editor_search_begin(:backward)
-        when "\x11"
+        when TerminalKeys::CTRL_Q
           quit_editor
-        when "\x13"
+        when TerminalKeys::CTRL_S
           save_editor
-        when "\x1A"
+        when TerminalKeys::CTRL_R
+          modern_record_undo { run_editor_buffer } unless editor_search_active?
+        when TerminalKeys::CTRL_Z
           @editor_state.undo unless editor_search_active?
         else
           key_name = key_name_for(key)
@@ -94,11 +96,11 @@ module Kward
         return false if editor_search_active?
 
         case key
-        when "\x04"
+        when TerminalKeys::CTRL_D
           @editor_state.add_next_occurrence_selection
-        when "\e[1;4A", "\e[4A"
+        when *TerminalKeys::ALT_SHIFT_UP
           @editor_state.add_vertical_cursor(:up)
-        when "\e[1;4B", "\e[4B"
+        when *TerminalKeys::ALT_SHIFT_DOWN
           @editor_state.add_vertical_cursor(:down)
         else
           false
@@ -135,29 +137,29 @@ module Kward
       def modern_indentation_key_sequences(action)
         case [modern_indentation_modifier, action]
         when [:alt, :up]
-          ["\e[1;3A", "\e[3A"]
+          TerminalKeys::ALT_UP
         when [:alt, :down]
-          ["\e[1;3B", "\e[3B"]
+          TerminalKeys::ALT_DOWN
         when [:alt, :right]
-          ["\e[1;3C", "\e[3C"]
+          TerminalKeys::ALT_RIGHT
         when [:alt, :select_up]
-          ["\e[1;4A", "\e[4A"]
+          TerminalKeys::ALT_SHIFT_UP
         when [:alt, :select_down]
-          ["\e[1;4B", "\e[4B"]
+          TerminalKeys::ALT_SHIFT_DOWN
         when [:alt, :select_right]
-          ["\e[1;4C", "\e[4C"]
+          TerminalKeys::ALT_SHIFT_RIGHT
         when [:ctrl, :up]
-          ["\e[1;5A", "\e[5A"]
+          TerminalKeys::CTRL_UP
         when [:ctrl, :down]
-          ["\e[1;5B", "\e[5B"]
+          TerminalKeys::CTRL_DOWN
         when [:ctrl, :right]
-          ["\e[1;5C", "\e[5C"]
+          TerminalKeys::CTRL_RIGHT
         when [:ctrl, :select_up]
-          ["\e[1;6A", "\e[6A"]
+          TerminalKeys::CTRL_SHIFT_UP
         when [:ctrl, :select_down]
-          ["\e[1;6B", "\e[6B"]
+          TerminalKeys::CTRL_SHIFT_DOWN
         when [:ctrl, :select_right]
-          ["\e[1;6C", "\e[6C"]
+          TerminalKeys::CTRL_SHIFT_RIGHT
         else
           []
         end
@@ -171,17 +173,17 @@ module Kward
         return false if editor_search_active?
 
         case key
-        when "\e[1;5C", "\e[5C"
+        when *TerminalKeys::CTRL_RIGHT
           @editor_state.move_line_end
-        when "\e[1;5D", "\e[5D"
+        when *TerminalKeys::CTRL_LEFT
           @editor_state.move_line_start
-        when "\e[1;5A", "\e[5A"
+        when *TerminalKeys::CTRL_UP
           @editor_state.move_file_start
-        when "\e[1;5B", "\e[5B"
+        when *TerminalKeys::CTRL_DOWN
           @editor_state.move_file_end
-        when "\e[1;4C", "\e[4C"
+        when *TerminalKeys::ALT_SHIFT_RIGHT
           editor_extending_selection { @editor_state.move_to_next_word }
-        when "\e[1;4D", "\e[4D"
+        when *TerminalKeys::ALT_SHIFT_LEFT
           editor_extending_selection { @editor_state.move_to_previous_word }
         else
           false
@@ -190,15 +192,15 @@ module Kward
 
       def handle_modern_key_binding(key)
         case key
-        when "\x00"
+        when TerminalKeys::CTRL_SPACE
           true
-        when "\x03"
+        when TerminalKeys::CTRL_C
           editor_search_active? ? editor_search_cancel : copy_editor_selection
-        when "\x06"
+        when TerminalKeys::CTRL_F
           @editor_state.move_right unless editor_search_active?
-        when "\x16"
+        when TerminalKeys::CTRL_V
           modern_record_undo { @editor_state.yank_kill_buffer } unless editor_search_active?
-        when "\x18"
+        when TerminalKeys::CTRL_X
           modern_record_undo { cut_editor_selection } unless editor_search_active?
         else
           handle_modern_shared_key_binding(key)
@@ -237,6 +239,8 @@ module Kward
           return false unless modern_ctrl_shift_key?(code, modifier)
 
           @editor_state.selection_to_line_start_cursors
+        when 114
+          modern_record_undo { run_editor_buffer } unless editor_search_active?
         when 122
           return if editor_search_active?
 
@@ -250,7 +254,7 @@ module Kward
 
       def handle_modern_shared_key_binding(key)
         case key
-        when "\x04", "\x0B", "\x15", "\x17", "\x19", "\e[3~", "\ed", "\eD", "\e\b", "\e\x7F"
+        when TerminalKeys::CTRL_D, TerminalKeys::CTRL_K, TerminalKeys::CTRL_U, TerminalKeys::CTRL_W, TerminalKeys::CTRL_Y, *TerminalKeys::DELETE, "\ed", "\eD", "\e\b", "\e\x7F"
           modern_record_undo { handle_editor_key_binding(key) }
         else
           handle_editor_key_binding(key)
@@ -303,12 +307,9 @@ module Kward
       end
 
       def handle_modern_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        modern_record_undo { @editor_state.insert(normalize_paste(paste[:content])) } unless editor_search_active?
-        queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
-        true
+        handle_bracketed_paste(key) do |content|
+          modern_record_undo { @editor_state.insert(content) } unless editor_search_active?
+        end
       end
 
       def modern_insert_printable(text)

data/lib/kward/prompt_interface/editor/modes/vibe.rb

@@ -43,7 +43,7 @@ module Kward
 
         return vibe_stop_macro_recording if key == "q" && @editor_state.vibe_recording_macro && !%w[insert replace command].include?(@editor_state.vibe_mode)
         vibe_record_macro_key(key)
-        return vibe_begin_visual_mode("visual_block") if key == "\x16" && @editor_state.vibe_mode == "normal"
+        return vibe_begin_visual_mode("visual_block") if key == TerminalKeys::CTRL_V && @editor_state.vibe_mode == "normal"
         return handle_vibe_repeat_change if key == "." && @editor_state.vibe_mode == "normal"
         return handle_vibe_search_key(key) if editor_search_active?
         return handle_vibe_command_key(key) if @editor_state.vibe_mode == "command"
@@ -119,7 +119,7 @@ module Kward
           editor_search_confirm
         when "\b", "\x7F"
           editor_search_delete_character
-        when "\e", "\x03"
+        when "\e", TerminalKeys::CTRL_C
           editor_search_cancel
         else
           editor_search_append(key) if printable_key?(key)
@@ -135,7 +135,7 @@ module Kward
         return tab_result unless tab_result == false
 
         case key
-        when "\e", "\x03", :escape
+        when "\e", TerminalKeys::CTRL_C, :escape
           vibe_return_to_normal
         when "\b", "\x7F"
           vibe_record_undo { editor_delete_before_cursor }
@@ -153,162 +153,6 @@ module Kward
         end
       end
 
-      def handle_vibe_insert_readline_key(key)
-        csi_result = handle_vibe_insert_readline_csi_u_key(key)
-        return csi_result unless csi_result == false
-
-        handle_vibe_insert_readline_ansi_key(key)
-      end
-
-      def handle_vibe_insert_readline_csi_u_key(key)
-        sequence = parse_csi_u_key(key)
-        return false unless sequence
-
-        queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
-        modifier = sequence[:modifier]
-        normalized_code = sequence[:code].to_i.chr.downcase.ord rescue sequence[:code]
-        if ctrl_modifier?(modifier)
-          return handle_vibe_insert_readline_ctrl_key(normalized_code)
-        elsif alt_modifier?(modifier)
-          return handle_vibe_insert_readline_alt_key(normalized_code)
-        end
-
-        false
-      end
-
-      def handle_vibe_insert_readline_ansi_key(key)
-        case key
-        when "\x01"
-          @editor_state.move_line_start
-        when "\x02"
-          @editor_state.move_left
-        when "\x04"
-          vibe_record_undo { @editor_state.delete_at_cursor }
-        when "\x05"
-          @editor_state.move_line_end
-        when "\x06"
-          @editor_state.move_right
-        when "\x0B"
-          vibe_record_undo { @editor_state.kill_line_after_cursor }
-        when "\x15"
-          vibe_record_undo { @editor_state.kill_line_before_cursor }
-        when "\x17"
-          vibe_record_undo { @editor_state.delete_word_before_cursor }
-        when "\x19"
-          vibe_record_undo { @editor_state.yank_kill_buffer }
-        when "\e[D", "\eOD"
-          @editor_state.move_left
-        when "\e[C", "\eOC"
-          @editor_state.move_right
-        when "\e[H", "\eOH", "\e[1~", "\e[7~"
-          @editor_state.move_line_start
-        when "\e[F", "\eOF", "\e[4~", "\e[8~"
-          @editor_state.move_line_end
-        when "\e[3~"
-          vibe_record_undo { @editor_state.delete_at_cursor }
-        when "\eb", "\eB"
-          @editor_state.move_to_previous_word
-        when "\ef", "\eF"
-          @editor_state.move_to_next_word
-        when "\ed", "\eD"
-          vibe_record_undo { @editor_state.delete_word_after_cursor }
-        when "\e\b", "\e\x7F"
-          vibe_record_undo { @editor_state.delete_word_before_cursor }
-        else
-          handle_vibe_insert_modified_ansi_key(key)
-        end
-      end
-
-      def handle_vibe_insert_readline_ctrl_key(normalized_code)
-        case normalized_code
-        when 97
-          @editor_state.move_line_start
-        when 98
-          @editor_state.move_left
-        when 100
-          vibe_record_undo { @editor_state.delete_at_cursor }
-        when 101
-          @editor_state.move_line_end
-        when 102
-          @editor_state.move_right
-        when 107
-          vibe_record_undo { @editor_state.kill_line_after_cursor }
-        when 117
-          vibe_record_undo { @editor_state.kill_line_before_cursor }
-        when 119
-          vibe_record_undo { @editor_state.delete_word_before_cursor }
-        when 121
-          vibe_record_undo { @editor_state.yank_kill_buffer }
-        else
-          false
-        end
-      end
-
-      def handle_vibe_insert_readline_alt_key(normalized_code)
-        case normalized_code
-        when 98
-          @editor_state.move_to_previous_word
-        when 100
-          vibe_record_undo { @editor_state.delete_word_after_cursor }
-        when 102
-          @editor_state.move_to_next_word
-        else
-          false
-        end
-      end
-
-      def handle_vibe_insert_modified_ansi_key(key)
-        sequence = parse_modified_ansi_key(key)
-        return false unless sequence
-
-        case sequence[:type]
-        when :cursor
-          return false unless alt_modifier?(sequence[:modifier])
-
-          case sequence[:final]
-          when "C"
-            @editor_state.move_to_next_word
-          when "D"
-            @editor_state.move_to_previous_word
-          when "F"
-            @editor_state.move_line_end
-          when "H"
-            @editor_state.move_line_start
-          else
-            false
-          end
-        when :delete
-          return false unless alt_modifier?(sequence[:modifier])
-
-          vibe_record_undo { @editor_state.delete_word_after_cursor }
-        else
-          false
-        end
-      end
-
-      def handle_vibe_insert_named_key(key_name)
-        case key_name
-        when :escape
-          vibe_return_to_normal
-        when :return, :enter
-          vibe_record_undo { editor_insert_newline }
-        when :backspace
-          vibe_record_undo { editor_delete_before_cursor }
-        when :delete
-          vibe_record_undo { @editor_state.delete_at_cursor }
-        when :left
-          @editor_state.move_left
-        when :right
-          @editor_state.move_right
-        when :up
-          editor_move_up
-        when :down
-          editor_move_down
-        else
-          false
-        end
-      end
-
       def handle_vibe_replace_key(key)
         return if handle_editor_bracketed_paste_key(key)
 
@@ -317,7 +161,7 @@ module Kward
         return tab_result unless tab_result == false
 
         case key
-        when "\e", "\x03", :escape
+        when "\e", TerminalKeys::CTRL_C, :escape
           vibe_return_to_normal
         when "\b", "\x7F"
           vibe_record_undo { editor_delete_before_cursor }
@@ -339,7 +183,7 @@ module Kward
 
       def handle_vibe_command_key(key)
         case key
-        when "\e", "\x03", :escape
+        when "\e", TerminalKeys::CTRL_C, :escape
           @editor_state.vibe_command = ""
           vibe_return_to_normal
         when "\b", "\x7F"
@@ -363,12 +207,18 @@ module Kward
         case command
         when "w"
           save_editor
+        when /\Aw\s+(.+)\z/
+          save_editor(Regexp.last_match(1))
+        when "run"
+          vibe_record_undo { run_editor_buffer }
         when "q"
           vibe_quit_editor
         when "q!"
           close_editor
         when "wq"
           save_editor && close_editor
+        when /\Awq\s+(.+)\z/
+          save_editor(Regexp.last_match(1)) && close_editor
         when "x"
           save_editor if @editor_state&.dirty?
           close_editor if @editor_state
@@ -414,7 +264,7 @@ module Kward
       end
 
       def handle_vibe_normal_key(key)
-        if key == "\e" || key == "\x03"
+        if key == "\e" || key == TerminalKeys::CTRL_C
           @editor_state.vibe_pending = ""
           vibe_return_to_normal
           return true
@@ -477,7 +327,7 @@ module Kward
       end
 
       def vibe_normal_control_key?(key)
-        ["\n", "\r", "\b", "\x7F", "\x02", "\x04", "\x05", "\x06", "\x12", "\x15", "\x19"].include?(key)
+        ["\n", "\r", "\b", "\x7F", TerminalKeys::CTRL_B, TerminalKeys::CTRL_D, TerminalKeys::CTRL_E, TerminalKeys::CTRL_F, TerminalKeys::CTRL_R, TerminalKeys::CTRL_U, TerminalKeys::CTRL_Y].include?(key)
       end
 
       def vibe_visual_mode?
@@ -577,19 +427,19 @@ module Kward
           vibe_move_to_screen_line(editor_page_rows / 2)
         when "L"
           vibe_move_to_screen_line(editor_page_rows - count)
-        when "\x06"
+        when TerminalKeys::CTRL_F
           @editor_state.page_down(editor_page_rows)
-        when "\x02"
+        when TerminalKeys::CTRL_B
           @editor_state.page_up(editor_page_rows)
-        when "\x04"
+        when TerminalKeys::CTRL_D
           @editor_state.page_down(vibe_half_page_rows)
-        when "\x15"
+        when TerminalKeys::CTRL_U
           @editor_state.page_up(vibe_half_page_rows)
-        when "\x05"
+        when TerminalKeys::CTRL_E
           vibe_scroll_down
-        when "\x19"
+        when TerminalKeys::CTRL_Y
           vibe_scroll_up
-        when "\x12"
+        when TerminalKeys::CTRL_R
           @editor_state.redo
         when "i"
           vibe_enter_insert_mode(command)
@@ -691,7 +541,7 @@ module Kward
       def handle_vibe_visual_key(key)
         key_name = key_name_for(key)
         return handle_vibe_visual_named_key(key_name) if key_name
-        if key == "\e" || key == "\x03"
+        if key == "\e" || key == TerminalKeys::CTRL_C
           @editor_state.vibe_pending = ""
           vibe_cancel_visual_mode
           return true
@@ -1896,7 +1746,7 @@ module Kward
 
       def vibe_copy_range(start_index, end_index, status)
         @editor_state.copy_range(start_index, end_index)
-        @output_io.print("\e]52;c;#{Base64.strict_encode64(@editor_state.kill_buffer)}\a")
+        @output_io.print(TerminalSequences.osc52(@editor_state.kill_buffer))
         @output_io.flush if @output_io.respond_to?(:flush)
         @editor_state.status = status
       end
@@ -1928,7 +1778,7 @@ module Kward
 
       def vibe_record_insert_change_key(key)
         return unless @editor_state.vibe_last_change
-        return if ["\x03"].include?(key)
+        return if [TerminalKeys::CTRL_C].include?(key)
 
         @editor_state.vibe_last_change << key
       end

data/lib/kward/prompt_interface/editor/modes/vibe_insert_readline.rb

@@ -0,0 +1,166 @@
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Interactive terminal UI used by the CLI frontend.
+  class PromptInterface
+    # Readline-style insert-mode bindings for the Vibe editor mode.
+    module VibeInsertReadline
+      private
+
+      def handle_vibe_insert_readline_key(key)
+        csi_result = handle_vibe_insert_readline_csi_u_key(key)
+        return csi_result unless csi_result == false
+
+        handle_vibe_insert_readline_ansi_key(key)
+      end
+
+      def handle_vibe_insert_readline_csi_u_key(key)
+        sequence = parse_csi_u_key(key)
+        return false unless sequence
+
+        queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
+        modifier = sequence[:modifier]
+        normalized_code = sequence[:code].to_i.chr.downcase.ord rescue sequence[:code]
+        if ctrl_modifier?(modifier)
+          return handle_vibe_insert_readline_ctrl_key(normalized_code)
+        elsif alt_modifier?(modifier)
+          return handle_vibe_insert_readline_alt_key(normalized_code)
+        end
+
+        false
+      end
+
+      def handle_vibe_insert_readline_ansi_key(key)
+        case key
+        when TerminalKeys::CTRL_A
+          @editor_state.move_line_start
+        when TerminalKeys::CTRL_B
+          @editor_state.move_left
+        when TerminalKeys::CTRL_D
+          vibe_record_undo { @editor_state.delete_at_cursor }
+        when TerminalKeys::CTRL_E
+          @editor_state.move_line_end
+        when TerminalKeys::CTRL_F
+          @editor_state.move_right
+        when TerminalKeys::CTRL_K
+          vibe_record_undo { @editor_state.kill_line_after_cursor }
+        when TerminalKeys::CTRL_U
+          vibe_record_undo { @editor_state.kill_line_before_cursor }
+        when TerminalKeys::CTRL_W
+          vibe_record_undo { @editor_state.delete_word_before_cursor }
+        when TerminalKeys::CTRL_Y
+          vibe_record_undo { @editor_state.yank_kill_buffer }
+        when *TerminalKeys::LEFT
+          @editor_state.move_left
+        when *TerminalKeys::RIGHT
+          @editor_state.move_right
+        when *TerminalKeys::HOME
+          @editor_state.move_line_start
+        when *TerminalKeys::END_KEY
+          @editor_state.move_line_end
+        when *TerminalKeys::DELETE
+          vibe_record_undo { @editor_state.delete_at_cursor }
+        when "\eb", "\eB"
+          @editor_state.move_to_previous_word
+        when "\ef", "\eF"
+          @editor_state.move_to_next_word
+        when "\ed", "\eD"
+          vibe_record_undo { @editor_state.delete_word_after_cursor }
+        when "\e\b", "\e\x7F"
+          vibe_record_undo { @editor_state.delete_word_before_cursor }
+        else
+          handle_vibe_insert_modified_ansi_key(key)
+        end
+      end
+
+      def handle_vibe_insert_readline_ctrl_key(normalized_code)
+        case normalized_code
+        when 97
+          @editor_state.move_line_start
+        when 98
+          @editor_state.move_left
+        when 100
+          vibe_record_undo { @editor_state.delete_at_cursor }
+        when 101
+          @editor_state.move_line_end
+        when 102
+          @editor_state.move_right
+        when 107
+          vibe_record_undo { @editor_state.kill_line_after_cursor }
+        when 117
+          vibe_record_undo { @editor_state.kill_line_before_cursor }
+        when 119
+          vibe_record_undo { @editor_state.delete_word_before_cursor }
+        when 121
+          vibe_record_undo { @editor_state.yank_kill_buffer }
+        else
+          false
+        end
+      end
+
+      def handle_vibe_insert_readline_alt_key(normalized_code)
+        case normalized_code
+        when 98
+          @editor_state.move_to_previous_word
+        when 100
+          vibe_record_undo { @editor_state.delete_word_after_cursor }
+        when 102
+          @editor_state.move_to_next_word
+        else
+          false
+        end
+      end
+
+      def handle_vibe_insert_modified_ansi_key(key)
+        sequence = parse_modified_ansi_key(key)
+        return false unless sequence
+
+        case sequence[:type]
+        when :cursor
+          return false unless alt_modifier?(sequence[:modifier])
+
+          case sequence[:final]
+          when "C"
+            @editor_state.move_to_next_word
+          when "D"
+            @editor_state.move_to_previous_word
+          when "F"
+            @editor_state.move_line_end
+          when "H"
+            @editor_state.move_line_start
+          else
+            false
+          end
+        when :delete
+          return false unless alt_modifier?(sequence[:modifier])
+
+          vibe_record_undo { @editor_state.delete_word_after_cursor }
+        else
+          false
+        end
+      end
+
+      def handle_vibe_insert_named_key(key_name)
+        case key_name
+        when :escape
+          vibe_return_to_normal
+        when :return, :enter
+          vibe_record_undo { editor_insert_newline }
+        when :backspace
+          vibe_record_undo { editor_delete_before_cursor }
+        when :delete
+          vibe_record_undo { @editor_state.delete_at_cursor }
+        when :left
+          @editor_state.move_left
+        when :right
+          @editor_state.move_right
+        when :up
+          editor_move_up
+        when :down
+          editor_move_down
+        else
+          false
+        end
+      end
+    end
+  end
+end

data/lib/kward/prompt_interface/editor/renderer.rb

@@ -132,21 +132,21 @@ module Kward
         while index < rendered.length
           if rendered[index] == "\e" && (match = rendered[index..].match(/\A\e\[[0-9;:]*m/))
             output << match[0]
-            output << "\e[7m" if selected && match[0] == "\e[0m"
+            output << TerminalSequences::SGR_INVERSE if selected && match[0] == "\e[0m"
             index += match[0].length
             next
           end
 
           should_select = selection_ranges.any? { |range| visible_index >= range[0] && visible_index < range[1] }
           if should_select != selected
-            output << (should_select ? "\e[7m" : "\e[27m")
+            output << (should_select ? TerminalSequences::SGR_INVERSE : TerminalSequences::SGR_INVERSE_OFF)
             selected = should_select
           end
           output << rendered[index]
           visible_index += 1
           index += 1
         end
-        output << "\e[27m" if selected
+        output << TerminalSequences::SGR_INVERSE_OFF if selected
         output
       end
 
@@ -229,9 +229,10 @@ module Kward
       end
 
       def editor_display_path
-        Pathname.new(@editor_state.path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        path = @editor_state.path || @editor_state.display_path
+        Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s
       rescue StandardError
-        @editor_state.path
+        @editor_state.display_path || @editor_state.path
       end
 
       def editor_status_text