kward 0.73.1 → 0.75.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?
@@ -158,6 +174,7 @@ module Kward
 
       def editor_render_diff_line(line)
         text = line.to_s
+        return editor_render_side_by_side_diff_line(text) if @editor_state.side_by_side_diff_view?
         return colored(text, :green) if text.start_with?("+") && !text.start_with?("+++")
         return colored(text, :red) if text.start_with?("-") && !text.start_with?("---")
         return colored(text, :cyan) if text.start_with?("@@")
@@ -165,6 +182,16 @@ module Kward
         text
       end
 
+      def editor_render_side_by_side_diff_line(text)
+        return colored(text, :cyan) if text.start_with?("@@")
+        return text unless text.include?(" │ ")
+
+        left, right = text.split(" │ ", 2)
+        rendered_left = left.start_with?("-") ? colored(left, :red) : left
+        rendered_right = right.start_with?("+") ? colored(right, :green) : right
+        "#{rendered_left} │ #{rendered_right}"
+      end
+
       def editor_line_number_gutter_width
         [[@editor_state.lines.length.to_s.length, 4].max + 3, 1].max
       end

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
@@ -325,7 +373,11 @@ module Kward
       end
 
       def diff_view?
-        @diff_view == true
+        !@diff_view.nil? && @diff_view != false
+      end
+
+      def side_by_side_diff_view?
+        @diff_view == DiffViewMode::SIDE_BY_SIDE
       end
 
       def modern?
@@ -372,7 +424,7 @@ module Kward
         end
 
         restore_editor_snapshot(snapshot)
-        changed!(clear_selections: false)
+        changed!
         @status = "Undo"
         true
       end
@@ -385,7 +437,7 @@ module Kward
         end
 
         restore_editor_snapshot(snapshot)
-        changed!(clear_selections: false)
+        changed!
         @status = "Redo"
         true
       end
@@ -909,27 +961,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 +1277,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 +1290,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/prompt_interface/selection_prompt.rb

@@ -73,6 +73,8 @@ module Kward
         queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
 
         case code
+        when 9
+          modified_tab_sequence?(sequence) ? true : select_toggle_search
         when 13
           select_input_active? ? select_input_action_result : select_current_choice
         when 27
@@ -501,25 +503,43 @@ module Kward
 
       def select_typed_key(key)
         return select_insert_key(key) if select_input_active?
-        return select_begin_search if key == "/" && !select_search_active?
+        return select_toggle_search if select_search_toggle_key?(key)
         return select_action_key(key) unless select_search_active?
 
         select_insert_key(key)
       end
 
+      def select_search_toggle_key?(key)
+        TerminalKeys::TAB.include?(key)
+      end
+
+      def modified_tab_sequence?(sequence)
+        modifier = sequence[:modifier]
+        modifier && modifier != 1
+      end
+
+      def select_toggle_search
+        select_search_active? ? select_pause_search : select_begin_search
+      end
+
       def select_begin_search
         return unless @select_state
 
         @select_state[:search_active] = true
-        self.composer_input = ""
-        self.composer_cursor = 0
         true
       end
 
-      def select_cancel_search
+      def select_pause_search
         return unless @select_state
 
         @select_state[:search_active] = false
+        true
+      end
+
+      def select_cancel_search
+        return unless @select_state
+
+        select_pause_search
         self.composer_input = ""
         self.composer_cursor = 0
         @select_state[:selection_index] = 0
@@ -607,7 +627,7 @@ module Kward
 
       def selection_matches
         choices = @select_state ? @select_state[:choices] : []
-        filter = select_search_active? ? composer_input.downcase.strip : ""
+        filter = (select_search_active? || !composer_input.strip.empty?) ? composer_input.downcase.strip : ""
         matches = filter.empty? ? choices : choices.select { |choice| choice.downcase.include?(filter) }
         clamp_selection_index(matches.length)
         matches
@@ -666,7 +686,7 @@ module Kward
         return "Renaming · Enter save · Esc cancel" if select_input_active?
 
         text = "↑/↓ select · Enter open"
-        text = "#{text} · / search" unless select_search_active?
+        text = "#{text} · Tab search" unless select_search_active?
         action_keys = @select_state ? @select_state[:action_keys].to_h : {}
         action_keys.each do |key, action|
           text = "#{text} · #{key} #{action[:action]}"

data/lib/kward/prompt_interface.rb

@@ -12,6 +12,7 @@ require_relative "ansi"
 require_relative "terminal_sequences"
 require_relative "terminal_keys"
 require_relative "editor_mode"
+require_relative "diff_view_mode"
 require_relative "prompt_interface/banner"
 require_relative "prompt_interface/composer_state"
 require_relative "prompt_interface/editor/state"
@@ -125,7 +126,7 @@ module Kward
       end
     end
 
-    def initialize(input: $stdin, output: $stdout, slash_commands: [], overlay_settings: nil, footer: nil, composer_status: nil, busy_help: true, attachment_badges: nil, attachment_parser: nil, banner_message: nil, tab_keybindings: nil, prompt_history: nil, editor_mode: nil, editor_mode_source: nil, editor_auto_indent: true, editor_auto_indent_source: nil, editor_auto_close_pairs: true, editor_auto_close_pairs_source: nil, editor_soft_wrap: true, editor_soft_wrap_source: nil, editor_bar_cursor: true, editor_bar_cursor_source: nil, editor_line_numbers: "absolute", editor_line_numbers_source: nil)
+    def initialize(input: $stdin, output: $stdout, slash_commands: [], overlay_settings: nil, footer: nil, composer_status: nil, busy_help: true, attachment_badges: nil, attachment_parser: nil, banner_message: nil, tab_keybindings: nil, prompt_history: nil, editor_mode: nil, editor_mode_source: nil, editor_auto_indent: true, editor_auto_indent_source: nil, editor_auto_close_pairs: true, editor_auto_close_pairs_source: nil, editor_soft_wrap: true, editor_soft_wrap_source: nil, editor_bar_cursor: true, editor_bar_cursor_source: nil, editor_line_numbers: "absolute", editor_line_numbers_source: nil, diff_view: "auto", diff_view_source: nil)
       @input_io = input
       @output_io = output
       @reader = TTY::Reader.new(input: input, output: output, interrupt: :error)
@@ -206,6 +207,8 @@ module Kward
       @editor_bar_cursor_source = editor_bar_cursor_source
       @editor_line_numbers = normalize_editor_line_numbers(editor_line_numbers)
       @editor_line_numbers_source = editor_line_numbers_source
+      @diff_view = DiffViewMode.normalize(diff_view)
+      @diff_view_source = diff_view_source
     end
 
     def start(render: true)

data/lib/kward/prompts/commands.rb

@@ -8,9 +8,8 @@ module Kward
       { name: "exit", description: "Exit the interactive session.", argument_hint: "" },
       { name: "quit", description: "Exit the interactive session.", argument_hint: "" },
       { name: "new", description: "Start a new session.", argument_hint: "" },
-      { name: "sessions", description: "Open the saved sessions picker.", argument_hint: "[path]" },
-      { name: "resume", description: "Alias for /sessions.", argument_hint: "[path]" },
-      { name: "name", description: "Name or clear the current session.", argument_hint: "[name]" },
+      { name: "session", description: "Open saved sessions or name the current session.", argument_hint: "[path]|name [name]" },
+      { name: "resume", description: "Alias for /session.", argument_hint: "[path]" },
       { name: "rename", description: "Rename the current session.", argument_hint: "<name>" },
       { name: "clone", description: "Clone the current session.", argument_hint: "" },
       { name: "fork", description: "Fork from an earlier prompt into a new session.", argument_hint: "" },
@@ -36,6 +35,7 @@ module Kward
       { name: "tab", description: "Manage tabs.", argument_hint: "[1-n|move|close|new|name]" },
       { name: "status", description: "Show the current status message.", argument_hint: "" },
       { name: "stats", description: "Show telemetry logging stats.", argument_hint: "[range]" },
+      { name: "hooks", description: "Inspect lifecycle hooks.", argument_hint: "[list|events|logs|doctor|trust|untrust]" },
       { name: "memory", description: "Inspect and manage Kward memory.", argument_hint: "[enable|disable|auto-summary|core|add|list|forget|promote|relax|inspect|why|summarize]" }
     ].freeze
     BUILTIN_RESERVED_COMMAND_NAMES = BUILTIN_COMMANDS.map { |command| command[:name] }.freeze

data/lib/kward/prompts.rb

@@ -25,7 +25,8 @@ module Kward
         sections << prompt_section("Persona", persona_prompt(workspace_root, model: model, reasoning_effort: reasoning_effort, now: now))
         sections << prompt_section("Plugin context", plugin_context) unless plugin_context.to_s.empty?
       end
-      sections << prompt_section("Configured skills", skills_prompt, source: ConfigFiles.skills.empty? ? nil : File.join(ConfigFiles.config_dir, "skills"))
+      skills = ConfigFiles.skills(workspace_root: workspace_root)
+      sections << prompt_section("Configured skills", skills_prompt(skills), source: skills.empty? ? nil : File.join(ConfigFiles.config_dir, "skills"))
       sections << prompt_section(workspace_agents_context_label(workspace_root), workspace_agents_context(workspace_root), source: ConfigFiles.workspace_agents_file?(workspace_root) ? ConfigFiles.workspace_agents_path(workspace_root) : nil)
       sections.compact
     end
@@ -97,18 +98,17 @@ module Kward
       { label: label, content: content, source: source }
     end
 
-    def skills_prompt
-      skills = ConfigFiles.skills
+    def skills_prompt(skills = ConfigFiles.skills)
       return nil if skills.empty?
 
       lines = [
-        "Configured skills are available in the Kward config directory.",
-        "When a task matches a skill, use read_skill to load its instructions before proceeding.",
+        "Agent Skills are available.",
+        "When a task matches a skill's description, use read_skill to load its instructions before proceeding.",
+        "Use read_skill with a relative path to read referenced files inside a skill directory.",
         "Available skills:"
       ]
       skills.each do |skill|
-        description = skill.description.empty? ? "No description provided." : skill.description
-        lines << "- #{skill.name}: #{description}"
+        lines << "- #{skill.name}: #{skill.description}"
       end
       lines.join("\n")
     end

data/lib/kward/rpc/mcp_status.rb

@@ -0,0 +1,50 @@
+require_relative "../mcp/server_config"
+require_relative "redactor"
+
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # JSON-RPC backend namespace used by UI clients.
+  module RPC
+    # Builds RPC-visible MCP server status payloads.
+    class MCPStatus
+      def initialize(config_manager:)
+        @config_manager = config_manager
+      end
+
+      def to_h
+        config = @config_manager.read(redacted: false)
+        clients = MCP::ServerConfig.clients_from_config(config).to_h { |client| [client.name, client] }
+        servers = MCP::ServerConfig.configured_servers(config).map do |name, settings|
+          server_status(name, settings, clients[name.to_s])
+        end
+        { servers: servers }
+      end
+
+      private
+
+      def server_status(name, settings, client)
+        base = { name: name.to_s, transport: "stdio", toolCount: 0 }
+        unless client
+          return base.merge(status: "unavailable", error: "command not configured") if settings["command"].to_s.empty?
+
+          return base.merge(status: "unavailable", error: "unsupported MCP server configuration")
+        end
+
+        tools = client.list_tools
+        base.merge(status: "available", toolCount: tools.length)
+      rescue StandardError => e
+        base.merge(status: "unavailable", toolCount: 0, error: redacted_error(e.message, client))
+      ensure
+        client&.close
+      end
+
+      def redacted_error(message, client)
+        text = Redactor.redact_string(message.to_s)
+        command = client&.transport&.respond_to?(:command) ? client.transport.command.to_s : ""
+        return text if command.empty?
+
+        text.gsub(command, File.basename(command))
+      end
+    end
+  end
+end

data/lib/kward/rpc/prompt_bridge.rb

@@ -17,6 +17,32 @@ module Kward
         @pending_requests = {}
       end
 
+      def request_tool_approval(tool_call_id:, tool_name:, args:, cancellation: nil)
+        request_id = SecureRandom.uuid
+        @mutex.synchronize { @pending_requests[request_id] = true }
+        cancellation&.on_cancel { cancel_request(request_id) }
+        unless cancellation&.cancelled?
+          @server.notify("tool/approvalRequested", {
+            sessionId: @session_id,
+            approvalRequestId: request_id,
+            toolCallId: tool_call_id,
+            toolName: tool_name,
+            args: args
+          })
+        end
+
+        @mutex.synchronize do
+          @condition.wait(@mutex) until @answers.key?(request_id)
+          answer = @answers.delete(request_id)
+          @pending_requests.delete(request_id)
+          approved_answer?(answer)
+        end
+      end
+
+      def answer_tool_approval(request_id, approved:)
+        answer_raw(request_id, !!approved)
+      end
+
       def ask_user_question(questions, cancellation: nil)
         questions = validate_questions(questions)
         request_id = SecureRandom.uuid
@@ -41,28 +67,36 @@ module Kward
       end
 
       def answer(request_id, answers)
+        answer_raw(request_id, normalize_answers(answers))
+      end
+
+      def cancel_request(request_id)
         @mutex.synchronize do
           request_id = request_id.to_s
           return unless @pending_requests.key?(request_id)
           return if @answers.key?(request_id)
 
-          @answers[request_id] = normalize_answers(answers)
+          @answers[request_id] = nil
           @condition.broadcast
         end
       end
 
-      def cancel_request(request_id)
+      private
+
+      def answer_raw(request_id, value)
         @mutex.synchronize do
           request_id = request_id.to_s
           return unless @pending_requests.key?(request_id)
           return if @answers.key?(request_id)
 
-          @answers[request_id] = nil
+          @answers[request_id] = value
           @condition.broadcast
         end
       end
 
-      private
+      def approved_answer?(answer)
+        answer == true
+      end
 
       def normalize_answers(answers)
         return nil if answers.nil?

data/lib/kward/rpc/runtime_payloads.rb

@@ -2,7 +2,7 @@
 module Kward
   # JSON-RPC backend namespace used by UI clients.
   module RPC
-    # Builders for Tauren-compatible runtime state payloads.
+    # Builders for frontend-neutral runtime state payloads.
     module RuntimePayloads
       module_function