kward 0.73.1 → 0.74.0

data/lib/kward/mcp/stdio_transport.rb

@@ -0,0 +1,106 @@
+require "json"
+require "open3"
+require "timeout"
+
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Model Context Protocol client support.
+  module MCP
+    # JSON-RPC transport for local MCP servers that communicate over stdio.
+    class StdioTransport
+      DEFAULT_TIMEOUT_SECONDS = 10
+
+      def initialize(command:, args: [], env: {}, timeout_seconds: DEFAULT_TIMEOUT_SECONDS)
+        @command = command.to_s
+        @args = Array(args).map(&:to_s)
+        @env = env || {}
+        @timeout_seconds = timeout_seconds || DEFAULT_TIMEOUT_SECONDS
+        @mutex = Mutex.new
+        @started = false
+      end
+
+      def request(method, params = nil)
+        @mutex.synchronize do
+          start
+          id = next_id
+          write_message({ jsonrpc: "2.0", id: id, method: method, params: params }.compact)
+          read_response(id)
+        end
+      end
+
+      def notify(method, params = nil)
+        @mutex.synchronize do
+          start
+          write_message({ jsonrpc: "2.0", method: method, params: params }.compact)
+        end
+      end
+
+      def close
+        @stdin&.close unless @stdin&.closed?
+        @stdout&.close unless @stdout&.closed?
+        @stderr&.close unless @stderr&.closed?
+        @stderr_thread&.kill
+        terminate_process
+      rescue IOError
+        nil
+      end
+
+      private
+
+      def terminate_process
+        return unless @wait_thread&.alive?
+
+        Process.kill("TERM", @wait_thread.pid)
+        @wait_thread.join(1)
+        Process.kill("KILL", @wait_thread.pid) if @wait_thread.alive?
+      rescue Errno::ESRCH, IOError
+        nil
+      end
+
+      def start
+        return if @started
+        raise ArgumentError, "MCP server command is required" if @command.empty?
+
+        @stdin, @stdout, @stderr, @wait_thread = Open3.popen3(@env, @command, *@args)
+        @stderr_thread = Thread.new { @stderr.each_line { |_line| } }
+        @started = true
+      rescue SystemCallError => e
+        raise "Failed to start MCP server #{@command}: #{e.message}"
+      end
+
+      def next_id
+        @next_id ||= 0
+        @next_id += 1
+      end
+
+      def write_message(message)
+        @stdin.write(JSON.generate(message))
+        @stdin.write("\n")
+        @stdin.flush
+      rescue IOError, Errno::EPIPE => e
+        raise "MCP server #{@command} is not accepting requests: #{e.message}"
+      end
+
+      def read_response(expected_id)
+        Timeout.timeout(@timeout_seconds) do
+          loop do
+            line = @stdout.gets
+            raise "MCP server #{@command} closed stdout" unless line
+
+            message = JSON.parse(line)
+            next unless message["id"] == expected_id
+
+            error = message["error"]
+            raise "MCP request failed: #{error["message"] || error.inspect}" if error
+
+            return message["result"] || {}
+          end
+        end
+      rescue JSON::ParserError
+        raise "MCP server #{@command} returned invalid JSON"
+      rescue Timeout::Error
+        raise "MCP server #{@command} did not respond within #{@timeout_seconds} seconds"
+      end
+    end
+  end
+end

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

@@ -279,6 +279,34 @@ module Kward
         end
       end
 
+      def handle_editor_search_csi_u_key(sequence, enter: :confirm, restore_cursor_on_cancel: true)
+        result = case sequence[:code]
+                 when 13
+                   if enter == :repeat
+                     shift_modifier?(sequence[:modifier]) ? editor_search_repeat(:backward) : editor_search_repeat(:forward)
+                   else
+                     editor_search_confirm
+                   end
+                 when 27
+                   editor_search_cancel(restore_cursor: restore_cursor_on_cancel)
+                 when 8, 127
+                   editor_search_delete_character
+                 else
+                   normalized_code = ctrl_code(sequence[:code])
+                   if ctrl_modifier?(sequence[:modifier]) && normalized_code == 103
+                     shift_modifier?(sequence[:modifier]) ? editor_search_repeat(:backward) : editor_search_repeat(:forward)
+                   elsif (text = csi_u_printable_text(sequence))
+                     editor_search_append(text)
+                   elsif csi_u_text_field?(sequence)
+                     true
+                   else
+                     false
+                   end
+                 end
+        queue_pending_keys(sequence[:remaining]) if result != false && sequence[:remaining] && !sequence[:remaining].empty?
+        result
+      end
+
       def handle_editor_mouse_key(key)
         event = parse_editor_mouse_key(key)
         return false unless event
@@ -902,32 +930,40 @@ module Kward
 
       def editor_search_begin(direction = :forward)
         @editor_state.begin_search(direction)
+        ensure_editor_cursor_visible
         true
       end
 
       def editor_search_append(text)
         @editor_state.append_search(text)
+        ensure_editor_cursor_visible
         true
       end
 
       def editor_search_delete_character
         @editor_state.delete_search_character
+        ensure_editor_cursor_visible
         true
       end
 
-      def editor_search_confirm
+      def editor_search_confirm(clear_highlights: true)
         @editor_state.confirm_search
+        @editor_state.clear_search_highlights if clear_highlights
+        ensure_editor_cursor_visible
         true
       end
 
-      def editor_search_cancel
-        @editor_state.cancel_search
+      def editor_search_cancel(restore_cursor: true)
+        @editor_state.cancel_search(restore_cursor: restore_cursor)
+        ensure_editor_cursor_visible
         true
       end
 
       def editor_search_repeat(direction = nil)
         direction ||= @editor_state.search_direction
         @editor_state.repeat_search(direction)
+        @editor_state.clear_search_highlights unless @editor_state.search_active
+        ensure_editor_cursor_visible
         true
       end
 
@@ -939,6 +975,31 @@ module Kward
         end
 
         @editor_state.repeat_search(direction, query)
+        @editor_state.clear_search_highlights
+        ensure_editor_cursor_visible
+        true
+      end
+
+      def ensure_editor_cursor_visible
+        return false unless @editor_state
+
+        content_width = [screen_width - 4, 1].max
+        visible_count = editor_visible_line_count
+        line_index, column = @editor_state.cursor_line_and_column
+        gutter_width = editor_line_number_gutter_width
+        text_width = editor_text_width(content_width, gutter_width)
+        sync_editor_wrap_state(text_width)
+
+        if current_editor_soft_wrap?
+          cursor_visual_row = editor_visual_row_for(line_index, column, text_width)
+          @editor_state.viewport_row = [[@editor_state.viewport_row, cursor_visual_row - visible_count + 1].max, cursor_visual_row].min
+          @editor_state.viewport_row = [@editor_state.viewport_row, 0].max
+        else
+          @editor_state.viewport_row = [[@editor_state.viewport_row, line_index - visible_count + 1].max, line_index].min
+          @editor_state.viewport_row = [@editor_state.viewport_row, 0].max
+          @editor_state.viewport_column = [[@editor_state.viewport_column.to_i, column - text_width + 1].max, column].min
+          @editor_state.viewport_column = [@editor_state.viewport_column, 0].max
+        end
         true
       end
 

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

@@ -112,6 +112,10 @@ module Kward
       def handle_emacs_csi_u_key(key)
         sequence = parse_csi_u_key(key)
         return false unless sequence
+        if editor_search_active?
+          search_result = handle_editor_search_csi_u_key(sequence)
+          return search_result unless search_result == false
+        end
 
         code = sequence[:code]
         modifier = sequence[:modifier]

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

@@ -37,16 +37,18 @@ module Kward
 
         case key
         when "\n", "\r"
-          return editor_search_confirm if editor_search_active?
+          return editor_search_repeat(:forward) if editor_search_active?
           modern_record_undo { modern_insert_text("\n") }
         when "\t"
           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 "\a"
+          return editor_search_repeat(:forward) if editor_search_active?
         when TerminalKeys::CTRL_C
           return editor_search_cancel if editor_search_active?
         when "\e"
-          return editor_search_cancel if editor_search_active?
+          return editor_search_cancel(restore_cursor: false) if editor_search_active?
           return @editor_state.collapse_to_primary_selection if @editor_state.multi_cursor?
           return @editor_state.clear_selection if @editor_state.selection_active?
         when "/"
@@ -79,6 +81,10 @@ module Kward
       def handle_modern_csi_u_key(key)
         sequence = parse_csi_u_key(key)
         return false unless sequence
+        if editor_search_active?
+          search_result = handle_editor_search_csi_u_key(sequence, enter: :repeat, restore_cursor_on_cancel: false)
+          return search_result unless search_result == false
+        end
 
         code = sequence[:code]
         modifier = sequence[:modifier]
@@ -197,7 +203,7 @@ module Kward
         when TerminalKeys::CTRL_C
           editor_search_active? ? editor_search_cancel : copy_editor_selection
         when TerminalKeys::CTRL_F
-          @editor_state.move_right unless editor_search_active?
+          editor_search_begin(:forward) unless editor_search_active?
         when TerminalKeys::CTRL_V
           modern_record_undo { @editor_state.yank_kill_buffer } unless editor_search_active?
         when TerminalKeys::CTRL_X
@@ -229,7 +235,7 @@ module Kward
 
           @editor_state.add_next_occurrence_selection
         when 102
-          @editor_state.move_right unless editor_search_active?
+          editor_search_begin(:forward) unless editor_search_active?
         when 118
           modern_record_undo { @editor_state.yank_kill_buffer } unless editor_search_active?
         when 120