kward 0.82.0 → 0.84.0

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

@@ -1,5 +1,6 @@
 require "fileutils"
-require_relative "../../scratchpad_runner"
+require_relative "../../scratchpad_languages"
+require_relative "runner"
 
 # Namespace for the Kward CLI agent runtime.
 module Kward
@@ -13,6 +14,10 @@ module Kward
         !@editor_state.nil?
       end
 
+      def editor_visible?
+        editor_active?
+      end
+
       def open_selected_file_in_editor(fallback_to_typed_path: false)
         path = selected_file_open_path
         if path
@@ -58,6 +63,7 @@ module Kward
           language: language
         )
         @editor_state.status = scratchpad_status_text(language)
+        @editor_agent_suspended = false
         @prompt_label = "Edit>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -95,6 +101,7 @@ module Kward
         end
 
         @editor_state = EditorState.new(path: full_path, content: File.exist?(full_path) ? File.read(full_path) : "", new_file: !File.exist?(full_path), editor_mode: current_editor_mode)
+        @editor_agent_suspended = false
         @prompt_label = "Edit>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -115,6 +122,7 @@ module Kward
         diff_view_mode = current_diff_view_mode
         viewer_content = diff_view_mode == DiffViewMode::SIDE_BY_SIDE ? side_by_side_diff_content(content.to_s) : content.to_s
         @editor_state = EditorState.new(path: path.to_s, content: viewer_content, new_file: true, editor_mode: current_editor_mode, readonly: true, diff_view: diff_view_mode)
+        @editor_agent_suspended = false
         @prompt_label = "Diff>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -236,13 +244,19 @@ module Kward
       end
 
       def close_editor
+        cancel_editor_runner
         disable_editor_mouse_reporting(force: true)
         restore_editor_cursor_shape_locked
+        @editor_runner_state = nil
+        @editor_runner_completion = nil
+        @editor_runner_output_visible = false
+        clear_editor_runner_selection
         @editor_text_width = nil
         @editor_save_as_active = false
         @editor_save_as_buffer = ""
         @editor_save_callback = nil
         @editor_state = nil
+        @editor_agent_suspended = false
         @prompt_label = "You>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -252,10 +266,17 @@ module Kward
 
       def handle_editor_key(key)
         return if key.nil?
+        return handle_editor_prompt_key(key) if @editor_prompt_active
+        return handle_editor_runner_output_key(key) if editor_runner_output_visible?
+
+        reset_editor_word_completion unless editor_word_completion_tab_key?(key) && !editor_search_active?
         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 cancel_editor_runner if editor_runner_running? && @editor_runner_completion && key == TerminalKeys::CTRL_C
+        super_copy_result = handle_editor_super_copy_key(key)
+        return super_copy_result unless super_copy_result == false
         return handle_vibe_key(key) if @editor_state&.vibe?
         return handle_emacs_key(key) if @editor_state&.emacs?
         return handle_modern_key(key) if @editor_state&.modern?
@@ -312,6 +333,80 @@ module Kward
         end
       end
 
+      def handle_editor_super_copy_key(key)
+        sequence = parse_csi_u_key(key)
+        return false unless sequence
+        return false unless super_modifier?(sequence[:modifier]) && ctrl_code(sequence[:code]) == 99
+
+        queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
+        return editor_search_cancel if editor_search_active?
+        return false unless editor_selection_active?
+
+        if @editor_state.vibe? && vibe_visual_mode?
+          vibe_yank_visual_selection
+        else
+          copy_editor_selection
+        end
+      end
+
+      def editor_prompt_action(instruction)
+        {
+          editor_prompt: {
+            instruction: instruction.to_s.strip,
+            display_input: ":prompt #{instruction.to_s.strip}"
+          }
+        }
+      end
+
+      def begin_editor_prompt
+        @editor_prompt_active = true
+        @editor_prompt_input = ""
+        @editor_state.status = "Prompt: "
+        true
+      end
+
+      def handle_editor_prompt_key(key)
+        sequence = parse_csi_u_key(key)
+        if sequence
+          queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
+          return handle_editor_prompt_key("\r") if sequence[:code] == 13
+          return handle_editor_prompt_key("\e") if sequence[:code] == 27
+          return handle_editor_prompt_key("\b") if [8, 127].include?(sequence[:code])
+
+          text = csi_u_printable_text(sequence)
+          return handle_editor_prompt_key(text) if text
+
+          return true
+        end
+
+        case key
+        when "\e", TerminalKeys::CTRL_C, :escape
+          @editor_prompt_active = false
+          @editor_prompt_input = ""
+          @editor_state.status = EditorStatusText.default(readonly: @editor_state.readonly?, editor_mode: @editor_state.editor_mode)
+          true
+        when "\b", "\x7F"
+          @editor_prompt_input = @editor_prompt_input[0...-1]
+          @editor_state.status = "Prompt: #{@editor_prompt_input}"
+        when "\n", "\r"
+          instruction = @editor_prompt_input.strip
+          @editor_prompt_active = false
+          @editor_prompt_input = ""
+          if instruction.empty?
+            @editor_state.status = "Prompt instruction required"
+            true
+          else
+            editor_prompt_action(instruction)
+          end
+        else
+          if printable_key?(key)
+            @editor_prompt_input += key
+            @editor_state.status = "Prompt: #{@editor_prompt_input}"
+          end
+          true
+        end
+      end
+
       def handle_editor_csi_u_key(key)
         sequence = parse_csi_u_key(key)
         return false unless sequence
@@ -1318,45 +1413,16 @@ module Kward
         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
+        ScratchpadLanguages.normalize(language)
       end
 
       def scratchpad_display_path(language)
-        case language.to_sym
-        when :markdown
-          "scratchpad.md"
-        when :ruby
-          "scratchpad.rb"
-        else
-          "scratchpad.txt"
-        end
+        ScratchpadLanguages.display_path(language)
       end
 
       def scratchpad_status_text(language)
-        runnable = language.to_sym == :ruby
+        runnable = ScratchpadLanguages.runnable?(language)
         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"

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

@@ -136,7 +136,7 @@ module Kward
         line_index, column = @editor_state.cursor_line_and_column
         return nil unless editor_endwise_line_exists?(line_index)
 
-        language = editor_syntax_language
+        language = editor_effective_syntax_language(line_index)
         definition = ENDWISE_LANGUAGES[language]
         return nil unless definition
 
@@ -190,7 +190,8 @@ module Kward
         line_index >= 0 && line_index < @editor_state.lines.length
       end
 
-      def editor_endwise_line_opens_block?(line_index, language = editor_syntax_language)
+      def editor_endwise_line_opens_block?(line_index, language = nil)
+        language ||= editor_effective_syntax_language(line_index)
         code = editor_endwise_code_line_at(line_index, language)
         return false if editor_endwise_ignored_definition?(code, language)
 
@@ -200,7 +201,7 @@ module Kward
       end
 
       def editor_endwise_closing_keyword_for_line(line_index, column, called_with_modifier: false)
-        language = editor_syntax_language
+        language = editor_effective_syntax_language(line_index)
         definition = ENDWISE_LANGUAGES[language]
         return nil unless definition
 
@@ -221,6 +222,9 @@ module Kward
             return close if @editor_state.lines.length <= scan_line + 1
 
             line_below = @editor_state.lines[scan_line + 1].to_s
+            next_language = editor_effective_syntax_language(scan_line + 1)
+            return close if next_language != language
+
             code_below = editor_endwise_code_line_at(scan_line + 1, language)
             closes_any_block = editor_endwise_closes_block?(code_below, language)
             closes_this_block = editor_endwise_closes_with?(code_below, close)
@@ -254,6 +258,8 @@ module Kward
       end
 
       def editor_endwise_code_line_at(line_index, language)
+        return "" unless editor_effective_syntax_language(line_index) == language
+
         definition = ENDWISE_LANGUAGES[language]
         line = @editor_state.lines[line_index].to_s
         return "" if editor_endwise_inside_block_comment?(line_index, definition.fetch(:block_comments))
@@ -263,7 +269,10 @@ module Kward
 
       def editor_endwise_inside_block_comment?(line_index, block_comments)
         active_comment = nil
-        @editor_state.lines.first(line_index + 1).each_with_index do |line, index|
+        first_index = editor_syntax_context_start(line_index)
+        first_index = 0 unless first_index
+        (first_index..line_index).each do |index|
+          line = @editor_state.lines[index].to_s
           if active_comment
             target_line = index == line_index
             active_comment = nil if line.match?(active_comment.fetch(:end))

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

@@ -198,6 +198,8 @@ module Kward
 
       def handle_modern_key_binding(key)
         case key
+        when TerminalKeys::CTRL_PERIOD
+          begin_editor_prompt
         when TerminalKeys::CTRL_SPACE
           true
         when TerminalKeys::CTRL_C
@@ -221,6 +223,8 @@ module Kward
         end
 
         case normalized_code
+        when 46
+          begin_editor_prompt
         when 13
           return false if editor_search_active?