kward 0.72.0 → 0.73.1

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

@@ -1,3 +1,6 @@
+require "fileutils"
+require_relative "../../scratchpad_runner"
+
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Interactive terminal UI used by the CLI frontend.
@@ -43,6 +46,31 @@ module Kward
         "$#{path}"
       end
 
+      def open_scratchpad(language = :text, content: "")
+        language = normalize_scratchpad_language(language)
+        @editor_state = EditorState.new(
+          path: scratchpad_display_path(language),
+          display_path: scratchpad_display_path(language),
+          content: content.to_s,
+          new_file: true,
+          editor_mode: current_editor_mode,
+          virtual: true,
+          language: language
+        )
+        @editor_state.status = scratchpad_status_text(language)
+        @prompt_label = "Edit>"
+        self.composer_input = ""
+        self.composer_cursor = 0
+        @composer.clear_attachments
+        @pending_keys.clear
+        @file_overlay_dismissed_token = nil
+        @file_open_dismissed_token = nil
+        @asking = true
+        set_editor_bar_cursor_locked if current_editor_bar_cursor?
+        enable_editor_mouse_reporting
+        true
+      end
+
       def open_editor(path, allow_new: false, base_dir: Dir.pwd, restrict_to_workspace: true)
         full_path = File.expand_path(path.to_s, base_dir)
         root = File.expand_path(Dir.pwd)
@@ -131,6 +159,8 @@ module Kward
         disable_editor_mouse_reporting(force: true)
         restore_editor_cursor_shape_locked
         @editor_text_width = nil
+        @editor_save_as_active = false
+        @editor_save_as_buffer = ""
         @editor_state = nil
         @prompt_label = "You>"
         self.composer_input = ""
@@ -143,6 +173,7 @@ module Kward
         return if key.nil?
         mouse_result = handle_editor_mouse_key(key)
         return mouse_result unless mouse_result == false
+        return handle_editor_save_as_key(key) if @editor_save_as_active
         return handle_readonly_editor_key(key) if @editor_state&.readonly?
         return handle_vibe_key(key) if @editor_state&.vibe?
         return handle_emacs_key(key) if @editor_state&.emacs?
@@ -175,14 +206,14 @@ module Kward
           editor_insert_tab unless editor_search_active?
         when "\b", "\x7F"
           editor_search_active? ? editor_search_delete_character : delete_editor_selection || editor_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?
           return @editor_state.clear_selection if @editor_state.selection_active?
-        when "\x11"
+        when TerminalKeys::CTRL_Q
           quit_editor
-        when "\x13"
+        when TerminalKeys::CTRL_S
           save_editor
         when "/"
           clear_editor_selection_before_edit unless editor_search_active?
@@ -270,20 +301,7 @@ module Kward
       end
 
       def parse_editor_mouse_key(key)
-        match = key.to_s.match(/\A\e\[<(\d+);(\d+);(\d+)([Mm])/)
-        return nil unless match
-
-        code = match[1].to_i
-        {
-          code: code,
-          button: code & 3,
-          column: match[2].to_i,
-          row: match[3].to_i,
-          action: match[4],
-          release: match[4] == "m",
-          drag: (code & 32).positive?,
-          remaining: key.to_s[match[0].length..].to_s
-        }
+        parse_sgr_mouse_event(key)
       end
 
       def handle_editor_mouse_press(event)
@@ -451,13 +469,13 @@ module Kward
         return false if editor_search_active?
 
         case key
-        when "\e[1;2D", "\e[2D"
+        when *TerminalKeys::SHIFT_LEFT
           editor_extending_selection { @editor_state.move_left }
-        when "\e[1;2C", "\e[2C"
+        when *TerminalKeys::SHIFT_RIGHT
           editor_extending_selection { @editor_state.move_right }
-        when "\e[1;2A", "\e[2A"
+        when *TerminalKeys::SHIFT_UP
           editor_extending_selection { editor_move_up }
-        when "\e[1;2B", "\e[2B"
+        when *TerminalKeys::SHIFT_DOWN
           editor_extending_selection { editor_move_down }
         else
           false
@@ -466,39 +484,39 @@ module Kward
 
       def handle_editor_key_binding(key)
         case key
-        when "\x01"
+        when TerminalKeys::CTRL_A
           @editor_state.move_line_start unless editor_search_active?
-        when "\x02"
+        when TerminalKeys::CTRL_B
           @editor_state.move_left unless editor_search_active?
-        when "\x04"
+        when TerminalKeys::CTRL_D
           @editor_state.delete_at_cursor unless editor_search_active?
-        when "\x05"
+        when TerminalKeys::CTRL_E
           @editor_state.move_line_end unless editor_search_active?
-        when "\x06"
+        when TerminalKeys::CTRL_F
           @editor_state.move_right unless editor_search_active?
-        when "\x00"
+        when TerminalKeys::CTRL_SPACE
           @editor_state.begin_selection unless editor_search_active?
-        when "\x0B"
+        when TerminalKeys::CTRL_K
           @editor_state.kill_line_after_cursor unless editor_search_active?
-        when "\x0E"
+        when TerminalKeys::CTRL_N
           editor_move_down unless editor_search_active?
-        when "\x10"
+        when TerminalKeys::CTRL_P
           editor_move_up unless editor_search_active?
-        when "\x15"
+        when TerminalKeys::CTRL_U
           @editor_state.kill_line_before_cursor unless editor_search_active?
-        when "\x17"
+        when TerminalKeys::CTRL_W
           @editor_state.delete_word_before_cursor unless editor_search_active?
-        when "\x19"
+        when TerminalKeys::CTRL_Y
           editor_selection_active? ? copy_editor_selection : @editor_state.yank_kill_buffer unless editor_search_active?
-        when "\e[D", "\eOD"
+        when *TerminalKeys::LEFT
           @editor_state.move_left unless editor_search_active?
-        when "\e[C", "\eOC"
+        when *TerminalKeys::RIGHT
           @editor_state.move_right unless editor_search_active?
-        when "\e[H", "\eOH", "\e[1~", "\e[7~"
+        when *TerminalKeys::HOME
           @editor_state.move_line_start unless editor_search_active?
-        when "\e[F", "\eOF", "\e[4~", "\e[8~"
+        when *TerminalKeys::END_KEY
           @editor_state.move_line_end unless editor_search_active?
-        when "\e[3~"
+        when *TerminalKeys::DELETE
           delete_editor_selection || @editor_state.delete_at_cursor unless editor_search_active?
         when "\eb", "\eB"
           @editor_state.move_to_previous_word unless editor_search_active?
@@ -600,12 +618,9 @@ module Kward
       end
 
       def handle_editor_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        @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|
+          @editor_state.insert(content) unless editor_search_active?
+        end
       end
 
       def ctrl_code(code)
@@ -669,12 +684,12 @@ module Kward
         return named_result unless named_result == false || named_result.nil?
 
         case key
-        when "\x11"
+        when TerminalKeys::CTRL_Q
           close_editor
-        when "\x06"
+        when TerminalKeys::CTRL_F
           editor_search_active? ? editor_search_append(key) : editor_search_begin
-        when "\x03"
-          editor_search_cancel if editor_search_active?
+        when TerminalKeys::CTRL_C
+          editor_search_active? ? editor_search_cancel : copy_editor_selection
         when "/"
           editor_search_active? ? editor_search_append(key) : editor_search_begin
         when "\b", "\x7F"
@@ -707,6 +722,10 @@ module Kward
           return editor_search_active? ? editor_search_append(key) : editor_search_begin
         end
 
+        if (ctrl_modifier?(modifier) || super_modifier?(modifier)) && ctrl_code(code) == 99
+          return editor_search_active? ? editor_search_cancel : copy_editor_selection
+        end
+
         case code
         when 13
           editor_search_confirm if editor_search_active?
@@ -726,12 +745,9 @@ module Kward
       end
 
       def handle_readonly_bracketed_paste_key(key)
-        paste = read_bracketed_paste(key)
-        return false unless paste
-
-        queue_pending_keys(paste[:remaining]) if paste[:remaining] && !paste[:remaining].empty?
-        @editor_state.status = "Read-only diff" unless editor_search_active?
-        true
+        handle_bracketed_paste(key) do |_content|
+          @editor_state.status = "Read-only diff" unless editor_search_active?
+        end
       end
 
       def handle_readonly_named_key(key_name)
@@ -786,12 +802,18 @@ module Kward
         line, column = @editor_state.cursor_line_and_column
         text_width = current_editor_text_width
         row_start = editor_visual_row_start_column(line, column, text_width)
+        visual_column = column - row_start
         if row_start.positive?
-          target_column = row_start - text_width + column - row_start
+          target_column = row_start - text_width + visual_column
           return @editor_state.set_cursor_line_and_column(line, target_column)
         end
 
-        @editor_state.move_up
+        return @editor_state.move_up if line.zero?
+
+        previous_line = @editor_state.lines[line - 1].to_s
+        previous_row_start = editor_last_visual_row_start_column(previous_line, text_width)
+        target_column = [previous_row_start + visual_column, previous_line.length].min
+        @editor_state.set_cursor_line_and_column(line - 1, target_column)
       end
 
       def editor_move_down
@@ -800,14 +822,26 @@ module Kward
         line, column = @editor_state.cursor_line_and_column
         text_width = current_editor_text_width
         row_start = editor_visual_row_start_column(line, column, text_width)
+        visual_column = column - row_start
         next_start = row_start + text_width
         current_line = @editor_state.lines[line].to_s
         if next_start < current_line.length
-          target_column = [next_start + column - row_start, current_line.length].min
+          target_column = [next_start + visual_column, current_line.length].min
           return @editor_state.set_cursor_line_and_column(line, target_column)
         end
 
-        @editor_state.move_down
+        return @editor_state.move_down if line >= @editor_state.lines.length - 1
+
+        next_line = @editor_state.lines[line + 1].to_s
+        target_column = [visual_column, next_line.length].min
+        @editor_state.set_cursor_line_and_column(line + 1, target_column)
+      end
+
+      def editor_last_visual_row_start_column(line, text_width)
+        length = line.to_s.length
+        return 0 if length.zero?
+
+        ((length - 1) / text_width) * text_width
       end
 
       def current_editor_text_width
@@ -845,7 +879,7 @@ module Kward
         return false if text.empty?
 
         @editor_state.push_kill(text)
-        @output_io.print("\e]52;c;#{Base64.strict_encode64(text)}\a")
+        @output_io.print(TerminalSequences.osc52(text))
         @output_io.flush if @output_io.respond_to?(:flush)
         @editor_state.clear_selection
         @editor_state.status = "Copied selection"
@@ -923,7 +957,7 @@ module Kward
       def enable_editor_mouse_reporting
         return if @editor_mouse_reporting_enabled
 
-        @output_io.print("\e[?1003h\e[?1006h")
+        @output_io.print(TerminalSequences::MOUSE_REPORTING_ENABLE)
         @output_io.flush if @output_io.respond_to?(:flush)
         @editor_mouse_reporting_enabled = true
       end
@@ -931,7 +965,7 @@ module Kward
       def disable_editor_mouse_reporting(force: false)
         return unless force || @editor_mouse_reporting_enabled
 
-        @output_io.print("\e[?1006l\e[?1003l")
+        @output_io.print(TerminalSequences::MOUSE_REPORTING_DISABLE)
         @output_io.flush if @output_io.respond_to?(:flush)
         @editor_mouse_reporting_enabled = false
       end
@@ -989,19 +1023,33 @@ module Kward
         true
       end
 
-      def save_editor
+      def save_editor(path = nil, prompt_for_path: true)
         return false unless @editor_state
         if @editor_state.readonly?
           @editor_state.status = "Read-only diff"
           return true
         end
 
+        if path.to_s.strip.empty? && @editor_state.path.to_s.empty?
+          if prompt_for_path
+            begin_editor_save_as
+            return true
+          end
+
+          @editor_state.status = "Use :w filename"
+          return false
+        end
+
+        return false if !path.to_s.strip.empty? && !bind_editor_save_path(path)
+
         if @editor_state.file_changed_on_disk? && !@editor_state.overwrite_confirmed
           @editor_state.overwrite_confirmed = true
           @editor_state.status = "File changed on disk. Press Ctrl+S again to overwrite."
           return true
         end
 
+        parent = File.dirname(@editor_state.path)
+        FileUtils.mkdir_p(parent) unless Dir.exist?(parent)
         File.write(@editor_state.path, @editor_state.buffer)
         @editor_state.refresh_after_save(@editor_state.buffer)
         true
@@ -1010,6 +1058,158 @@ module Kward
         false
       end
 
+      def begin_editor_save_as
+        @editor_save_as_active = true
+        @editor_save_as_buffer = ""
+        @editor_state.status = "Save as: "
+        true
+      end
+
+      def handle_editor_save_as_key(key)
+        return true if handle_bundled_key(key) { |token| handle_editor_save_as_key(token) }
+
+        csi_result = handle_editor_save_as_csi_u_key(key)
+        return csi_result unless csi_result == false
+
+        case key
+        when "\n", "\r"
+          finish_editor_save_as
+        when "\e", TerminalKeys::CTRL_C
+          cancel_editor_save_as
+        when "\b", "\x7F"
+          @editor_save_as_buffer = @editor_save_as_buffer.to_s[0...-1]
+          update_editor_save_as_status
+        else
+          key_name = key_name_for(key)
+          case key_name
+          when :return, :enter
+            finish_editor_save_as
+          when :backspace
+            @editor_save_as_buffer = @editor_save_as_buffer.to_s[0...-1]
+            update_editor_save_as_status
+          else
+            if printable_key?(key)
+              @editor_save_as_buffer = @editor_save_as_buffer.to_s + key
+              update_editor_save_as_status
+            end
+          end
+        end
+        true
+      end
+
+      def handle_editor_save_as_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?
+        code = sequence[:code]
+        modifier = sequence[:modifier]
+        normalized_code = ctrl_code(code)
+        if code == 13
+          return finish_editor_save_as
+        elsif [8, 127].include?(code)
+          @editor_save_as_buffer = @editor_save_as_buffer.to_s[0...-1]
+          return update_editor_save_as_status
+        elsif code == 27 || (ctrl_modifier?(modifier) && normalized_code == 99)
+          return cancel_editor_save_as
+        end
+
+        text = csi_u_printable_text(sequence)
+        if text
+          @editor_save_as_buffer = @editor_save_as_buffer.to_s + text
+          return update_editor_save_as_status
+        end
+
+        true
+      end
+
+      def finish_editor_save_as
+        path = @editor_save_as_buffer.to_s.strip
+        @editor_save_as_active = false
+        @editor_save_as_buffer = ""
+        if path.empty?
+          @editor_state.status = "Save canceled"
+          return true
+        end
+
+        save_editor(path, prompt_for_path: false)
+      end
+
+      def cancel_editor_save_as
+        @editor_save_as_active = false
+        @editor_save_as_buffer = ""
+        @editor_state.status = "Save canceled"
+        true
+      end
+
+      def update_editor_save_as_status
+        @editor_state.status = "Save as: #{@editor_save_as_buffer}"
+        true
+      end
+
+      def bind_editor_save_path(path)
+        full_path = File.expand_path(path.to_s.strip, Dir.pwd)
+        root = File.expand_path(Dir.pwd)
+        unless full_path == root || full_path.start_with?("#{root}/")
+          @editor_state.status = "Cannot save outside workspace"
+          return false
+        end
+
+        @editor_state.bind_path(full_path)
+        @editor_syntax_language_path = nil
+        @editor_indent_unit_path = nil
+        true
+      end
+
+      def run_editor_buffer
+        return false unless @editor_state
+
+        language = @editor_state.language || editor_syntax_language
+        result = ScratchpadRunner.run(language, @editor_state.buffer)
+        @editor_state.replace_range(0, @editor_state.buffer.length, result.buffer)
+        @editor_state.status = "Ran #{language} (exit #{result.exit_status})"
+        true
+      rescue StandardError => e
+        @editor_state.status = "Run failed: #{e.message}" if @editor_state
+        false
+      end
+
+      def normalize_scratchpad_language(language)
+        case language.to_s.strip.downcase
+        when "", "text", "txt"
+          :text
+        when "markdown", "md"
+          :markdown
+        when "ruby", "rb"
+          :ruby
+        else
+          :text
+        end
+      end
+
+      def scratchpad_display_path(language)
+        case language.to_sym
+        when :markdown
+          "scratchpad.md"
+        when :ruby
+          "scratchpad.rb"
+        else
+          "scratchpad.txt"
+        end
+      end
+
+      def scratchpad_status_text(language)
+        runnable = language.to_sym == :ruby
+        case current_editor_mode
+        when "vibe"
+          runnable ? "NORMAL · i insert · :w filename save · :q quit · :run run" : "NORMAL · i insert · :w filename save · :q quit"
+        when "emacs"
+          runnable ? "C-x C-s save as · C-x C-c quit · C-r run" : "C-x C-s save as · C-x C-c quit"
+        else
+          runnable ? "Ctrl+S save as · Ctrl+Q quit · Ctrl+R run" : "Ctrl+S save as · Ctrl+Q quit"
+        end
+      end
+
       def printable_key?(key)
         key.is_a?(String) && key.length == 1 && key.match?(/[[:print:]]/)
       end

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

@@ -37,44 +37,44 @@ module Kward
         when "\b", "\x7F"
           clear_editor_selection_before_edit unless editor_search_active?
           editor_search_active? ? editor_search_delete_character : editor_delete_before_cursor
-        when "\x00"
+        when TerminalKeys::CTRL_SPACE
           @editor_state.begin_selection unless editor_search_active?
-        when "\x01"
+        when TerminalKeys::CTRL_A
           @editor_state.move_line_start unless editor_search_active?
-        when "\x02"
+        when TerminalKeys::CTRL_B
           @editor_state.move_left unless editor_search_active?
-        when "\x04"
+        when TerminalKeys::CTRL_D
           @editor_state.delete_at_cursor unless editor_search_active?
-        when "\x05"
+        when TerminalKeys::CTRL_E
           @editor_state.move_line_end unless editor_search_active?
-        when "\x06"
+        when TerminalKeys::CTRL_F
           @editor_state.move_right unless editor_search_active?
         when "\x07"
           emacs_cancel
-        when "\x0B"
+        when TerminalKeys::CTRL_K
           if editor_selection_active?
             emacs_kill_selection
           else
             @editor_state.kill_line_after_cursor unless editor_search_active?
           end
-        when "\x0E"
+        when TerminalKeys::CTRL_N
           editor_move_down unless editor_search_active?
-        when "\x10"
+        when TerminalKeys::CTRL_P
           editor_move_up unless editor_search_active?
-        when "\x12"
+        when TerminalKeys::CTRL_R
           editor_search_active? ? editor_search_append(key) : editor_search_begin(:backward)
-        when "\x13"
+        when TerminalKeys::CTRL_S
           editor_search_active? ? editor_search_append(key) : editor_search_begin(:forward)
-        when "\x15"
+        when TerminalKeys::CTRL_U
           @editor_state.kill_line_before_cursor unless editor_search_active?
-        when "\x16"
+        when TerminalKeys::CTRL_V
           @editor_state.page_down(editor_page_rows) unless editor_search_active?
-        when "\x17"
+        when TerminalKeys::CTRL_W
           editor_selection_active? ? emacs_kill_selection : @editor_state.delete_word_before_cursor unless editor_search_active?
-        when "\x18"
+        when TerminalKeys::CTRL_X
           @editor_state.emacs_pending = "C-x"
           @editor_state.status = "C-x"
-        when "\x19"
+        when TerminalKeys::CTRL_Y
           @editor_state.yank_from_kill_ring unless editor_search_active?
         when "\e"
           return editor_search_cancel if editor_search_active?
@@ -192,9 +192,9 @@ module Kward
         @editor_state.emacs_pending = nil
         key = emacs_ctrl_x_csi_u_key(key)
         case key
-        when "\x13"
+        when TerminalKeys::CTRL_S
           save_editor
-        when "\x03"
+        when TerminalKeys::CTRL_C
           quit_editor("Unsaved changes. Press C-x C-c again to discard.")
         else
           @editor_state.status = "Unknown C-x command"
@@ -209,9 +209,9 @@ module Kward
         queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
         case ctrl_code(sequence[:code])
         when 99
-          "\x03"
+          TerminalKeys::CTRL_C
         when 115
-          "\x13"
+          TerminalKeys::CTRL_S
         else
           key
         end
@@ -236,7 +236,7 @@ module Kward
         end
 
         @editor_state.copy_for_kill_ring(range[0], range[1])
-        @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.clear_selection
         @editor_state.status = "Copied region"