kward 0.73.1 → 0.74.0

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

@@ -88,10 +88,26 @@ module Kward
         visible = line.to_s[column_offset.to_i, text_width].to_s
         rendered = editor_render_visible_line(visible, line_index)
         line_start = @editor_state.line_start_offset(line_index)
+        rendered = editor_overlay_search_matches(rendered, line_start, column_offset, visible.length)
         rendered = editor_overlay_line_selections(rendered, line_start, column_offset, visible.length)
         editor_overlay_secondary_cursors(rendered, line_start, column_offset, visible.length, text_width)
       end
 
+      def editor_overlay_search_matches(rendered, line_start, column_offset, visible_length)
+        ranges = @editor_state.search_match_ranges
+        return rendered if ranges.empty?
+
+        visible_offset = line_start + column_offset.to_i
+        match_ranges = ranges.filter_map do |range|
+          match_start = [range[0] - visible_offset, 0].max
+          match_end = [range[1] - visible_offset, visible_length].min
+          [match_start, match_end] if match_start < match_end
+        end
+        return rendered if match_ranges.empty?
+
+        editor_overlay_selection(rendered, match_ranges)
+      end
+
       def editor_overlay_line_selections(rendered, line_start, column_offset, visible_length)
         ranges = @editor_state.selection_ranges
         return rendered if ranges.empty?

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

@@ -6,44 +6,82 @@ module Kward
     class EditorSearch
       attr_reader :query, :direction
 
+      def self.match_ranges(text, query, base_offset: 0)
+        query = query.to_s
+        return [] if query.empty?
+
+        haystack, needle = normalized_pair(text.to_s, query)
+        ranges = []
+        start = 0
+        while (index = haystack.index(needle, start))
+          ranges << [base_offset + index, base_offset + index + query.length]
+          start = index + [query.length, 1].max
+        end
+        ranges
+      end
+
+      def self.normalized_pair(buffer, query)
+        return [buffer, query] if case_sensitive?(query)
+
+        [buffer.downcase, query.downcase]
+      end
+
+      def self.case_sensitive?(query)
+        query.to_s.match?(/[[:upper:]]/)
+      end
+
       def initialize(direction: :forward)
         @active = false
         @query = +""
         @direction = direction
+        @origin_cursor = nil
+        @current_match = nil
       end
 
       def active?
         @active == true
       end
 
-      def begin(direction = :forward)
+      def begin(direction = :forward, cursor: nil)
         @active = true
         @direction = direction
         @query = +""
+        @origin_cursor = cursor
+        @current_match = nil
         status_prefix
       end
 
-      def cancel
+      def cancel(restore_cursor: true)
         @active = false
-        "Search cancelled"
+        cursor = @origin_cursor if restore_cursor
+        @origin_cursor = nil
+        @current_match = nil
+        { cursor: cursor, status: "Search cancelled", found: false }
       end
 
-      def append(text)
+      def append(text, buffer:, cursor:)
         @query << text.to_s
-        "#{status_prefix} #{@query}"
+        live_result(buffer: buffer, cursor: cursor)
       end
 
-      def delete_character
+      def delete_character(buffer:, cursor:)
         @query = @query[0...-1].to_s
-        "#{status_prefix} #{@query}"
+        live_result(buffer: buffer, cursor: cursor)
       end
 
       def confirm(buffer:, cursor:)
         confirmed_query = @query.to_s
         @active = false
+        @origin_cursor = nil
         return { status: "Search cancelled", found: false } if confirmed_query.empty?
 
+        if @current_match
+          return { cursor: @current_match, status: "Found: #{confirmed_query}", found: true }
+        end
+
         repeat(buffer: buffer, cursor: cursor, direction: @direction, query: confirmed_query)
+      ensure
+        @current_match = nil
       end
 
       def repeat(buffer:, cursor:, direction: @direction, query: @query)
@@ -52,12 +90,7 @@ module Kward
 
         @query = query
         @direction = direction
-        index = if direction == :backward
-          search_from = cursor.positive? ? cursor - 1 : buffer.length
-          buffer.rindex(query, search_from) || buffer.rindex(query)
-        else
-          buffer.index(query, cursor + 1) || buffer.index(query)
-        end
+        index = find_match(buffer, query, cursor, direction)
 
         if index
           { cursor: index, status: "Found: #{query}", found: true }
@@ -68,6 +101,30 @@ module Kward
 
       private
 
+      def live_result(buffer:, cursor:)
+        return { cursor: @origin_cursor, status: status_prefix, found: false } if @query.empty?
+
+        @origin_cursor = cursor if @origin_cursor.nil?
+        index = find_match(buffer, @query, @origin_cursor, @direction)
+        @current_match = index
+        if index
+          { cursor: index, status: "#{status_prefix} #{@query}", found: true }
+        else
+          { cursor: @origin_cursor, status: "No match: #{@query}", found: false }
+        end
+      end
+
+      def find_match(buffer, query, cursor, direction)
+        haystack, needle = self.class.normalized_pair(buffer.to_s, query.to_s)
+        cursor = cursor.to_i
+        if direction == :backward
+          search_from = cursor.positive? ? cursor - 1 : haystack.length
+          haystack.rindex(needle, search_from) || haystack.rindex(needle)
+        else
+          haystack.index(needle, cursor + 1) || haystack.index(needle)
+        end
+      end
+
       def status_prefix
         @direction == :backward ? "Search backward:" : "Search:"
       end

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

@@ -19,6 +19,7 @@ module Kward
       attr_reader :path, :display_path, :language, :original_content, :original_digest, :original_mtime, :original_size
       attr_reader :buffer, :undo_stack, :redo_stack, :kill_buffer, :kill_ring, :last_yank_range, :last_yank_index
       attr_accessor :viewport_row, :viewport_column, :status, :overwrite_confirmed, :quit_confirmed, :search_active, :search_query, :search_direction, :new_file, :editor_mode, :emacs_pending, :readonly, :diff_view
+      attr_reader :search_match_ranges
 
       def initialize(path:, content:, new_file: false, editor_mode: "modern", readonly: false, diff_view: false, virtual: false, display_path: nil, language: nil)
         @path = virtual ? nil : path.to_s
@@ -45,6 +46,7 @@ module Kward
         @search_active = @search.active?
         @search_query = @search.query
         @search_direction = @search.direction
+        @search_match_ranges = []
         @kill_state = EditorKillRing.new
         @kill_buffer = @kill_state.kill_buffer
         @selections = EditorSelections.new(cursor: @cursor, buffer_length: @buffer.length)
@@ -80,6 +82,7 @@ module Kward
         @search_active = other.search_active
         @search_query = other.search_query.dup
         @search_direction = other.search_direction
+        @search_match_ranges = other.search_match_ranges.map(&:dup)
         @kill_state = EditorKillRing.new(
           kill_buffer: other.kill_buffer.dup,
           kill_ring: other.kill_ring.map(&:dup),
@@ -231,6 +234,51 @@ module Kward
         sync_vibe_state
       end
 
+      def vibe_register_types
+        @vibe_state.register_types
+      end
+
+      def vibe_register_types=(value)
+        @vibe_state.register_types = value
+        sync_vibe_state
+      end
+
+      def vibe_kill_linewise
+        @vibe_state.kill_linewise
+      end
+
+      def vibe_kill_linewise=(value)
+        @vibe_state.kill_linewise = value
+        sync_vibe_state
+      end
+
+      def vibe_previous_change_cursor
+        @vibe_state.previous_change_cursor
+      end
+
+      def vibe_previous_change_cursor=(value)
+        @vibe_state.previous_change_cursor = value
+        sync_vibe_state
+      end
+
+      def vibe_jump_back_list
+        @vibe_state.jump_back_list
+      end
+
+      def vibe_jump_back_list=(value)
+        @vibe_state.jump_back_list = value
+        sync_vibe_state
+      end
+
+      def vibe_jump_forward_list
+        @vibe_state.jump_forward_list
+      end
+
+      def vibe_jump_forward_list=(value)
+        @vibe_state.jump_forward_list = value
+        sync_vibe_state
+      end
+
       def vibe_macros
         @vibe_state.macros
       end
@@ -372,7 +420,7 @@ module Kward
         end
 
         restore_editor_snapshot(snapshot)
-        changed!(clear_selections: false)
+        changed!
         @status = "Undo"
         true
       end
@@ -385,7 +433,7 @@ module Kward
         end
 
         restore_editor_snapshot(snapshot)
-        changed!(clear_selections: false)
+        changed!
         @status = "Redo"
         true
       end
@@ -909,27 +957,28 @@ module Kward
       end
 
       def begin_search(direction = :forward)
-        @status = @search.begin(direction)
+        @status = @search.begin(direction, cursor: @cursor)
         sync_search_state
         true
       end
 
-      def cancel_search
-        @status = @search.cancel
-        sync_search_state
+      def cancel_search(restore_cursor: true)
+        apply_search_result(@search.cancel(restore_cursor: restore_cursor))
+        @search_match_ranges = []
         true
       end
 
-      def append_search(text)
-        @status = @search.append(text)
-        sync_search_state
+      def clear_search_highlights
+        @search_match_ranges = []
         true
       end
 
+      def append_search(text)
+        apply_search_result(@search.append(text, buffer: @buffer, cursor: @cursor))
+      end
+
       def delete_search_character
-        @status = @search.delete_character
-        sync_search_state
-        true
+        apply_search_result(@search.delete_character(buffer: @buffer, cursor: @cursor))
       end
 
       def confirm_search
@@ -1224,6 +1273,7 @@ module Kward
         @search_active = @search.active?
         @search_query = @search.query
         @search_direction = @search.direction
+        @search_match_ranges = EditorSearch.match_ranges(@buffer, @search_query)
       end
 
       def sync_vibe_state
@@ -1236,6 +1286,11 @@ module Kward
         @vibe_visual_block_insert = @vibe_state.visual_block_insert
         @vibe_marks = @vibe_state.marks
         @vibe_registers = @vibe_state.registers
+        @vibe_register_types = @vibe_state.register_types
+        @vibe_kill_linewise = @vibe_state.kill_linewise
+        @vibe_previous_change_cursor = @vibe_state.previous_change_cursor
+        @vibe_jump_back_list = @vibe_state.jump_back_list
+        @vibe_jump_forward_list = @vibe_state.jump_forward_list
         @vibe_macros = @vibe_state.macros
         @vibe_recording_macro = @vibe_state.recording_macro
         @vibe_last_macro = @vibe_state.last_macro

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

@@ -6,7 +6,8 @@ module Kward
     class VibeEditorState
       attr_accessor :mode, :pending, :command, :last_change, :last_find
       attr_accessor :last_visual_selection, :visual_block_insert
-      attr_accessor :marks, :registers, :macros, :recording_macro, :last_macro
+      attr_accessor :marks, :registers, :register_types, :macros, :recording_macro, :last_macro
+      attr_accessor :kill_linewise, :previous_change_cursor, :jump_back_list, :jump_forward_list
 
       def initialize(editor_mode: "modern")
         @mode = editor_mode == "vibe" ? "normal" : nil
@@ -18,6 +19,11 @@ module Kward
         @visual_block_insert = nil
         @marks = {}
         @registers = {}
+        @register_types = {}
+        @kill_linewise = false
+        @previous_change_cursor = nil
+        @jump_back_list = []
+        @jump_forward_list = []
         @macros = {}
         @recording_macro = nil
         @last_macro = nil
@@ -34,6 +40,11 @@ module Kward
         state.visual_block_insert = other.visual_block_insert&.dup
         state.marks = other.marks.transform_values(&:dup)
         state.registers = other.registers.transform_values(&:dup)
+        state.register_types = other.register_types.transform_values(&:dup)
+        state.kill_linewise = other.kill_linewise
+        state.previous_change_cursor = other.previous_change_cursor
+        state.jump_back_list = other.jump_back_list.map(&:dup)
+        state.jump_forward_list = other.jump_forward_list.map(&:dup)
         state.macros = other.macros.transform_values(&:dup)
         state.recording_macro = other.recording_macro
         state.last_macro = other.last_macro

data/lib/kward/rpc/server.rb

@@ -434,6 +434,7 @@ module Kward
           memory: { supported: true, optIn: true, defaultEnabled: false, autoSummaryDefaultEnabled: false, promptInjection: "interactive", storage: { core: "json", soft: "jsonl", events: "jsonl" }, methods: MEMORY_METHODS },
           workers: workers_capability,
           commands: { supported: true, methods: COMMAND_METHODS, method: COMMAND_METHODS[0], runMethod: COMMAND_METHODS[1], sources: ["builtin", "prompt", "skill", "plugin"], executableSources: ["builtin", "plugin"] },
+          mcp: { supported: true, transport: "stdio", config: "mcpServers", exposes: ["tools"], unsupported: ["resources", "prompts", "sampling", "streamableHttp"] },
           startupResources: { supported: true, method: STARTUP_RESOURCE_METHODS.first },
           starterPack: { supported: false, reason: "cliOnlyInstallCommand" },
           shell: { supported: false, reason: "interactiveTuiOnly" },

data/lib/kward/tools/mcp_tool.rb

@@ -0,0 +1,118 @@
+require "json"
+require_relative "base"
+
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  module Tools
+    # Adapts an MCP server tool to Kward's model-callable tool interface.
+    class MCPTool < Base
+      attr_reader :server_name, :remote_name
+
+      def initialize(server_name:, client:, tool:)
+        @server_name = server_name.to_s
+        @client = client
+        @tool = tool
+        @remote_name = value(tool, "name").to_s
+        super(kward_name(@server_name, @remote_name), description, properties: {}, required: [])
+      end
+
+      def schema
+        {
+          type: "function",
+          function: {
+            name: name,
+            description: description,
+            parameters: input_schema
+          }
+        }
+      end
+
+      def call(args, _conversation, cancellation: nil)
+        cancellation&.raise_if_cancelled!
+        result = @client.call_tool(@remote_name, args || {})
+        format_result(result)
+      rescue StandardError => e
+        "MCP tool #{server_name}.#{remote_name} failed: #{e.message}"
+      end
+
+      def self.kward_name(server_name, tool_name)
+        "#{sanitize_name(server_name)}__#{sanitize_name(tool_name)}"
+      end
+
+      def self.sanitize_name(value)
+        text = value.to_s.gsub(/[^A-Za-z0-9_-]/, "_")
+        text = "mcp" if text.empty?
+        text[0, 60]
+      end
+
+      private
+
+      def kward_name(server_name, tool_name)
+        self.class.kward_name(server_name, tool_name)
+      end
+
+      def description
+        value(@tool, "description").to_s.empty? ? "MCP tool #{@server_name}.#{@remote_name}" : value(@tool, "description").to_s
+      end
+
+      def input_schema
+        schema = value(@tool, "inputSchema")
+        return empty_object_schema unless schema.is_a?(Hash)
+
+        schema.empty? ? empty_object_schema : schema
+      end
+
+      def empty_object_schema
+        { type: "object", properties: {}, additionalProperties: false }
+      end
+
+      def format_result(result)
+        return "MCP tool #{server_name}.#{remote_name} returned no content." unless result.is_a?(Hash)
+
+        parts = []
+        parts << "MCP tool #{server_name}.#{remote_name} reported an error:" if truthy?(value(result, "isError"))
+        parts.concat(format_content(value(result, "content")))
+
+        structured = value(result, "structuredContent")
+        parts << JSON.pretty_generate(structured) unless structured.nil?
+
+        parts.empty? ? "MCP tool #{server_name}.#{remote_name} returned no content." : parts.join("\n\n")
+      end
+
+      def format_content(content)
+        Array(content).filter_map do |entry|
+          next entry.to_s unless entry.is_a?(Hash)
+
+          case value(entry, "type")
+          when "text"
+            value(entry, "text").to_s
+          when "image"
+            "[MCP image content: #{value(entry, "mimeType") || "unknown MIME type"}]"
+          when "audio"
+            "[MCP audio content: #{value(entry, "mimeType") || "unknown MIME type"}]"
+          when "resource_link"
+            "[MCP resource link: #{value(entry, "uri") || value(entry, "name") || "unnamed"}]"
+          when "resource"
+            "[MCP embedded resource: #{resource_label(value(entry, "resource"))}]"
+          else
+            JSON.generate(entry)
+          end
+        end
+      end
+
+      def resource_label(resource)
+        return "unnamed" unless resource.is_a?(Hash)
+
+        value(resource, "uri") || value(resource, "name") || "unnamed"
+      end
+
+      def truthy?(value)
+        value == true || value.to_s == "true"
+      end
+
+      def value(object, key)
+        object[key] || object[key.to_sym]
+      end
+    end
+  end
+end

data/lib/kward/tools/registry.rb

@@ -8,6 +8,7 @@ require_relative "edit_file"
 require_relative "fetch_content"
 require_relative "fetch_raw"
 require_relative "list_directory"
+require_relative "mcp_tool"
 require_relative "read_file"
 require_relative "read_skill"
 require_relative "run_shell_command"
@@ -19,6 +20,7 @@ require_relative "search/code"
 require_relative "search/web"
 require_relative "search/web_fetch"
 require_relative "tool_call"
+require_relative "../mcp/server_config"
 require_relative "../telemetry/logger"
 require_relative "../tool_output_compactor"
 require_relative "../workspace"
@@ -60,7 +62,7 @@ module Kward
     # @param web_search_enabled [Boolean, nil] override for web search exposure
     # @param skills [Array<ConfigFiles::Skill>, nil] override discovered skills
     # @param ask_user_question_enabled [Boolean, nil] override question exposure
-    def initialize(workspace: Workspace.new, prompt: nil, web_search: WebSearch.new, web_fetch: WebFetch.new, code_search: CodeSearch.new, web_search_enabled: nil, skills: nil, ask_user_question_enabled: nil, allowed_tool_names: nil, write_lock: nil, writer_id: nil, tool_output_compactor: ToolOutputCompactor.new, telemetry_logger: TelemetryLogger.new, context_budget_meter: nil)
+    def initialize(workspace: Workspace.new, prompt: nil, web_search: WebSearch.new, web_fetch: WebFetch.new, code_search: CodeSearch.new, web_search_enabled: nil, skills: nil, ask_user_question_enabled: nil, allowed_tool_names: nil, write_lock: nil, writer_id: nil, tool_output_compactor: ToolOutputCompactor.new, telemetry_logger: TelemetryLogger.new, context_budget_meter: nil, mcp_clients: nil)
       @workspace = workspace
       @prompt = prompt
       @web_search = web_search
@@ -75,6 +77,13 @@ module Kward
       @tool_output_compactor = tool_output_compactor
       @telemetry_logger = telemetry_logger
       @context_budget_meter = context_budget_meter
+      @mcp_clients = if mcp_clients
+                       mcp_clients
+                     elsif @allowed_tool_names
+                       []
+                     else
+                       MCP::ServerConfig.clients_from_config(ConfigFiles.read_config)
+                     end
       @tools = build_tools.freeze
       @schemas = build_schema_tools.map(&:schema).freeze
     end
@@ -182,6 +191,7 @@ module Kward
         "list_directory", "read_file", "write_file", "edit_file", "run_shell_command", "code_search", "summarize_file_structure", "context_for_task", "context_budget_stats", "retrieve_tool_output"
       )
       tools.concat(@tools.values_at("web_search", "fetch_content", "fetch_raw")) if web_search_available?
+      tools.concat(@tools.values.select { |tool| tool.is_a?(Tools::MCPTool) })
       tools << @tools["read_skill"] if skills_available?
       tools << @tools["ask_user_question"] if ask_user_question_available?
       tools.compact
@@ -194,7 +204,7 @@ module Kward
         Tools::FetchRaw.new(web_fetch: @web_fetch),
         Tools::ReadSkill.new,
         Tools::AskUserQuestion.new(prompt: @prompt)
-      ]
+      ] + mcp_tool_values
     end
 
     def core_tools
@@ -224,6 +234,26 @@ module Kward
       skills.any?
     end
 
+    def mcp_tool_values
+      @mcp_tool_values ||= build_mcp_tools
+    end
+
+    def build_mcp_tools
+      Array(@mcp_clients).flat_map do |client|
+        client.list_tools.map do |tool|
+          Tools::MCPTool.new(server_name: client.name, client: client, tool: tool)
+        end
+      rescue StandardError => e
+        @telemetry_logger.log(
+          "mcp",
+          "server_unavailable",
+          "server" => client.respond_to?(:name) ? client.name : "unknown",
+          "error" => e.message
+        )
+        []
+      end
+    end
+
     def ask_user_question_available?
       return false if @ask_user_question_enabled == false
 

data/lib/kward/version.rb

@@ -1,5 +1,5 @@
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Current gem version.
-  VERSION = "0.73.1"
+  VERSION = "0.74.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kward
 version: !ruby/object:Gem::Version
-  version: 0.73.1
+  version: 0.74.0
 platform: ruby
 authors:
 - Kai Wood
@@ -137,6 +137,7 @@ files:
 - doc/files.md
 - doc/getting-started.md
 - doc/git.md
+- doc/mcp.md
 - doc/memory.md
 - doc/personas.md
 - doc/plugins.md
@@ -197,6 +198,9 @@ files:
 - lib/kward/local_command_runner.rb
 - lib/kward/local_pty_command_runner.rb
 - lib/kward/markdown_transcript.rb
+- lib/kward/mcp/client.rb
+- lib/kward/mcp/server_config.rb
+- lib/kward/mcp/stdio_transport.rb
 - lib/kward/memory/manager.rb
 - lib/kward/message_access.rb
 - lib/kward/message_text.rb
@@ -305,6 +309,7 @@ files:
 - lib/kward/tools/fetch_content.rb
 - lib/kward/tools/fetch_raw.rb
 - lib/kward/tools/list_directory.rb
+- lib/kward/tools/mcp_tool.rb
 - lib/kward/tools/read_file.rb
 - lib/kward/tools/read_skill.rb
 - lib/kward/tools/registry.rb