kward 0.83.0 → 0.85.0

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

@@ -1,4 +1,4 @@
-require_relative "../../editor_mode"
+require_relative "editor_mode"
 require_relative "../../text_boundary"
 require_relative "buffer"
 require_relative "file_marker"
@@ -180,6 +180,15 @@ module Kward
         sync_vibe_state
       end
 
+      def vibe_command_range
+        @vibe_state.command_range
+      end
+
+      def vibe_command_range=(value)
+        @vibe_state.command_range = value
+        sync_vibe_state
+      end
+
       def vibe_last_change
         @vibe_state.last_change
       end
@@ -207,15 +216,6 @@ module Kward
         sync_vibe_state
       end
 
-      def vibe_visual_block_insert
-        @vibe_state.visual_block_insert
-      end
-
-      def vibe_visual_block_insert=(value)
-        @vibe_state.visual_block_insert = value
-        sync_vibe_state
-      end
-
       def vibe_marks
         @vibe_state.marks
       end
@@ -1289,10 +1289,10 @@ module Kward
         @vibe_mode = @vibe_state.mode
         @vibe_pending = @vibe_state.pending
         @vibe_command = @vibe_state.command
+        @vibe_command_range = @vibe_state.command_range
         @vibe_last_change = @vibe_state.last_change
         @vibe_last_find = @vibe_state.last_find
         @vibe_last_visual_selection = @vibe_state.last_visual_selection
-        @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

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

@@ -53,6 +53,7 @@ module Kward
           keywords: %w[begin if while for try let quote function macro module baremodule struct mutable abstract primitive type do end else elseif catch finally true false nothing]
         },
         makefile: {
+          extensions: %w[.mk],
           filenames: %w[Makefile makefile GNUmakefile],
           line_comment: "#",
           keywords: %w[ifeq ifneq ifdef ifndef else endif include define endef export unexport override]
@@ -125,11 +126,17 @@ module Kward
       def editor_highlight_line(line, line_index = nil)
         return line.to_s unless @color_enabled
 
-        case editor_syntax_language
+        if editor_syntax_language == :markdown
+          editor_highlight_markdown(line, line_index)
+        else
+          editor_highlight_language_line(line, editor_syntax_language, line_index)
+        end
+      end
+
+      def editor_highlight_language_line(line, language, line_index = nil)
+        case language
         when :ruby
           editor_highlight_ruby(line, line_index)
-        when :markdown
-          editor_highlight_markdown(line)
         when :json
           editor_highlight_json(line)
         when :yaml
@@ -143,7 +150,7 @@ module Kward
         when :sql
           editor_highlight_sql(line)
         else
-          editor_highlight_generic(line, editor_syntax_language, line_index)
+          editor_highlight_generic(line, language, line_index)
         end
       end
 
@@ -395,16 +402,71 @@ module Kward
         nil
       end
 
-      def editor_highlight_markdown(line)
+      def editor_highlight_markdown(line, line_index = nil)
         text = line.to_s
+        fence_context = editor_markdown_fence_context(line_index)
+        return editor_highlight_markdown_fence(text) if fence_context == :marker
+        if fence_context.is_a?(Array)
+          language, nested_line_index = fence_context
+          return editor_highlight_language_line(text, language, nested_line_index) if language
+
+          return text
+        end
+
         return editor_highlight_markdown_heading(text) if text.match?(/\A\s{0,3}[#]{1,6}\s/)
-        return editor_highlight_markdown_fence(text) if text.match?(/\A\s*```/)
         return editor_highlight_markdown_blockquote(text) if text.match?(/\A\s*>/)
         return editor_highlight_markdown_list(text) if text.match?(/\A\s*(?:[-*+]\s+|\d+\.\s+)/)
 
         editor_highlight_markdown_inline(text)
       end
 
+      def editor_markdown_fence_context(line_index)
+        return nil unless line_index && @editor_state
+
+        inside_fence = false
+        language = nil
+        opening_index = nil
+        @editor_state.lines.first(line_index.to_i + 1).each_with_index do |line, index|
+          match = line.to_s.match(/\A\s*```([^`]*)\s*\z/)
+          if match
+            if inside_fence
+              inside_fence = false
+              language = nil
+              opening_index = nil
+            else
+              inside_fence = true
+              language = editor_markdown_fence_language(match[1])
+              opening_index = index
+            end
+            return :marker if index == line_index
+          elsif inside_fence && index == line_index
+            return [language, index, opening_index]
+          end
+        end
+
+        nil
+      end
+
+      def editor_effective_syntax_language(line_index = nil)
+        language = editor_syntax_language
+        return language unless language == :markdown
+
+        context = editor_markdown_fence_context(line_index)
+        context.is_a?(Array) ? context.first || :markdown : :markdown
+      end
+
+      def editor_syntax_context_start(line_index = nil)
+        return nil unless editor_syntax_language == :markdown
+
+        context = editor_markdown_fence_context(line_index)
+        context.is_a?(Array) ? context[2] : nil
+      end
+
+      def editor_markdown_fence_language(info)
+        name = info.to_s.strip.split(/\s/, 2).first.to_s.downcase
+        ScratchpadLanguages::ALIASES[name]
+      end
+
       def editor_highlight_markdown_heading(line)
         line.sub(/\A(\s{0,3}[#]{1,6}\s+)(.*)\z/) do
           "#{colored(Regexp.last_match(1), :cyan)}#{colored(Regexp.last_match(2), :bold)}"

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

@@ -5,7 +5,7 @@ module Kward
     # Modal Vibe editor state for one editor buffer.
     class VibeEditorState
       attr_accessor :mode, :pending, :command, :last_change, :last_find
-      attr_accessor :last_visual_selection, :visual_block_insert
+      attr_accessor :command_range, :last_visual_selection
       attr_accessor :marks, :registers, :register_types, :macros, :recording_macro, :last_macro
       attr_accessor :kill_linewise, :previous_change_cursor, :jump_back_list, :jump_forward_list
 
@@ -13,10 +13,10 @@ module Kward
         @mode = editor_mode == "vibe" ? "normal" : nil
         @pending = ""
         @command = ""
+        @command_range = nil
         @last_change = nil
         @last_find = nil
         @last_visual_selection = nil
-        @visual_block_insert = nil
         @marks = {}
         @registers = {}
         @register_types = {}
@@ -34,10 +34,10 @@ module Kward
         state.mode = other.mode&.dup
         state.pending = other.pending.dup
         state.command = other.command.dup
+        state.command_range = other.command_range&.dup
         state.last_change = other.last_change&.dup
         state.last_find = other.last_find&.dup
         state.last_visual_selection = other.last_visual_selection&.dup
-        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)

data/lib/kward/prompt_interface/file_overlay.rb

@@ -1,3 +1,5 @@
+require_relative "../text_matcher"
+
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # File-mention completion overlay behavior.
@@ -86,32 +88,78 @@ module Kward
       def file_overlay_matches
         token = active_file_open || active_file_mention
         return [] unless token
+        unless @file_mention_paths
+          start_file_mention_discovery_locked
+          return []
+        end
 
         query = token[:query].downcase
+        entries = project_file_path_entries
+        cache = @file_overlay_match_cache
+        return cache[:matches] if cache && cache[:query] == query && cache[:entries].equal?(entries)
+
+        pattern = TextMatcher.subsequence_pattern(query)
         matches = []
-        project_file_path_entries.each do |entry|
-          next unless file_mention_match?(entry[:downcase], query)
+        entries.each do |entry|
+          next unless TextMatcher.subsequence?(entry[:downcase], query, pattern)
 
           matches << entry[:path]
           break if matches.length >= FILE_MENTION_RESULT_LIMIT
         end
+        @file_overlay_match_cache = { query: query, entries: entries, matches: matches }
         matches
       end
 
-      def file_mention_match?(path, query)
-        return true if query.empty?
-        return true if path.include?(query)
-
-        query_chars = query.chars
-        query_chars.all? do |char|
-          index = path.index(char)
-          if index
-            path = path[(index + 1)..].to_s
-            true
-          else
-            false
+      def start_file_mention_discovery_locked
+        root = prompt_workspace_root
+        active_thread = @file_mention_discovery_thread
+        return if active_thread&.alive? && @file_mention_discovery_root == root
+
+        token = Object.new
+        start = Queue.new
+        @file_mention_discovery_root = root
+        @file_mention_discovery_token = token
+        worker = Thread.new do
+          start.pop
+          paths = discover_file_mention_paths(root)
+          entries = build_file_path_entries(paths)
+          @mutex.synchronize do
+            next unless @file_mention_discovery_token.equal?(token)
+
+            @file_mention_discovery_thread = nil
+            @file_mention_discovery_root = nil
+            @file_mention_discovery_token = nil
+            next unless root == prompt_workspace_root
+
+            @file_mention_paths = paths
+            @file_mention_path_entries_paths = paths
+            @file_mention_path_entries = entries
+            @file_overlay_match_cache = nil
+            render_prompt_locked if @started && @asking && file_overlay_visible?
           end
         end
+        worker.report_on_exception = false
+        @file_mention_discovery_thread = worker
+        start << true
+      end
+
+      def discover_file_mention_paths(root)
+        ProjectFiles.list(root: root)
+      end
+
+      def finish_file_mention_discovery_locked
+        root = prompt_workspace_root
+        @file_mention_discovery_thread = nil
+        @file_mention_discovery_root = nil
+        @file_mention_discovery_token = nil
+        @file_mention_paths = discover_file_mention_paths(root)
+        @file_mention_path_entries_paths = @file_mention_paths
+        @file_mention_path_entries = build_file_path_entries(@file_mention_paths)
+        @file_overlay_match_cache = nil
+      end
+
+      def file_mention_discovery_loading?
+        @file_mention_discovery_thread&.alive? && @file_mention_discovery_root == prompt_workspace_root
       end
 
       def project_file_paths(include_ignored: false)
@@ -127,7 +175,11 @@ module Kward
         return @file_mention_path_entries if @file_mention_path_entries_paths.equal?(paths) && @file_mention_path_entries
 
         @file_mention_path_entries_paths = paths
-        @file_mention_path_entries = paths.map { |path| { path: path, downcase: path.downcase } }
+        @file_mention_path_entries = build_file_path_entries(paths)
+      end
+
+      def build_file_path_entries(paths)
+        paths.map { |path| { path: path, downcase: path.downcase } }
       end
 
       def discover_project_file_paths(include_ignored: false)
@@ -165,6 +217,7 @@ module Kward
       def selected_file_overlay_path
         return nil unless file_overlay_visible?
 
+        finish_file_mention_discovery_locked unless @file_mention_paths
         matches = file_overlay_matches
         return nil if matches.empty?
 
@@ -200,6 +253,9 @@ module Kward
         return [] unless file_overlay_visible?
 
         matches = file_overlay_matches
+        if file_mention_discovery_loading?
+          return overlay_card_rows("Files", [overlay_text_line("Loading project files…", :muted)], width)
+        end
         if matches.empty?
           return overlay_card_rows("Files", [overlay_text_line("No matching files", :muted)], width)
         end

data/lib/kward/prompt_interface/key_handler.rb

@@ -6,6 +6,73 @@ module Kward
     module KeyHandler
       private
 
+      def filter_terminal_handoff_input_locked(chunk)
+        @handoff_input_buffer << chunk.to_s.b
+        forwarded = +"".b
+        tab_action = nil
+
+        until @handoff_input_buffer.empty?
+          if @handoff_input_buffer.start_with?(TerminalKeys::CTRL_T)
+            action = handle_tab_key_binding(TerminalKeys::CTRL_T)
+            if action != false
+              remainder = @handoff_input_buffer.byteslice(TerminalKeys::CTRL_T.bytesize..).to_s
+              queue_pending_keys(remainder) unless remainder.empty?
+              @handoff_input_buffer.clear
+              tab_action = action
+              break
+            end
+            forwarded << @handoff_input_buffer.slice!(0)
+            next
+          end
+
+          if @handoff_input_buffer.start_with?("\e")
+            complete = TerminalKeys::TAB_ACTION_SEQUENCES.find { |sequence| @handoff_input_buffer.start_with?(sequence) }
+            partial = TerminalKeys::TAB_ACTION_SEQUENCES.any? { |sequence| sequence.start_with?(@handoff_input_buffer) }
+            break if partial && !complete
+
+            if complete
+              action = handle_tab_key_binding(complete)
+              if action != false
+                remainder = @handoff_input_buffer.byteslice(complete.bytesize..).to_s
+                queue_pending_keys(remainder) unless remainder.empty?
+                @handoff_input_buffer.clear
+                tab_action = action
+                break
+              end
+              forwarded << complete
+              @handoff_input_buffer = @handoff_input_buffer.byteslice(complete.bytesize..).to_s.b
+              next
+            end
+
+            if (sequence = parse_csi_u_key(@handoff_input_buffer)) && @handoff_input_buffer.start_with?(sequence[:sequence])
+              legacy_key = legacy_handoff_key(sequence)
+              unless legacy_key.nil?
+                forwarded << legacy_key
+                @handoff_input_buffer = @handoff_input_buffer.byteslice(sequence[:sequence].bytesize..).to_s.b
+                next
+              end
+            end
+          end
+
+          forwarded << @handoff_input_buffer.slice!(0)
+        end
+
+        { input: forwarded, tab_action: tab_action }
+      end
+
+      def legacy_handoff_key(sequence)
+        event = csi_u_key_event(sequence)
+        return event[:text] if event[:type] == :printable
+        return "\r" if event[:type] == :enter
+        return "\b" if event[:type] == :backspace
+        return "\t" if event[:type] == :tab
+
+        return unless event[:type] == :modified && ctrl_modifier?(event[:modifier])
+        return unless event[:code].between?(32, 126)
+
+        (event[:code] & 0x1f).chr
+      end
+
       def read_key(nonblock: false)
         pending = @pending_keys.shift unless @pending_keys.empty?
         return pending if pending

data/lib/kward/prompt_interface/layout.rb

@@ -19,7 +19,7 @@ module Kward
       end
 
       def transcript_bottom_row(height = screen_height)
-        [height - @reserved_rows, 1].max
+        [height - @reserved_rows - TRANSCRIPT_COMPOSER_GAP_ROWS, 1].max
       end
 
     end

data/lib/kward/prompt_interface/overlay_renderer.rb

@@ -1,3 +1,5 @@
+require_relative "../terminal/text"
+
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Shared overlay drawing helpers for prompt UI popups.
@@ -63,7 +65,7 @@ module Kward
 
       def overlay_top_border(title, card_width)
         title = visible_truncate(title.to_s, [card_width - 4, 1].max)
-        plain_length = ANSI.strip(title).length
+        plain_length = TerminalText.width(ANSI.strip(title))
         colored("╭", :primary_green) + " #{colored(title, :primary_green, :bold)} " + colored("─" * [card_width - plain_length - 4, 0].max, :primary_green) + colored("╮", :primary_green)
       end
 
@@ -98,7 +100,7 @@ module Kward
       end
 
       def align_overlay_row(row, width)
-        plain_length = ANSI.strip(row).length
+        plain_length = TerminalText.width(ANSI.strip(row))
         padding = [width - plain_length, 0].max
         left = overlay_left_padding(width, plain_length)
         right = padding - left
@@ -152,14 +154,14 @@ module Kward
       end
 
       def visible_ljust(text, width)
-        text.to_s + (" " * [width - ANSI.strip(text.to_s).length, 0].max)
+        text.to_s + (" " * [width - TerminalText.width(ANSI.strip(text.to_s)), 0].max)
       end
 
       def visible_truncate(text, width)
         plain = ANSI.strip(text.to_s)
-        return text.to_s if plain.length <= width
+        return text.to_s if TerminalText.width(plain) <= width
 
-        plain[0, width]
+        TerminalText.truncate(plain, width)
       end
 
     end

data/lib/kward/prompt_interface/plugin_ui_requests.rb

@@ -0,0 +1,82 @@
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  class PromptInterface
+    # Terminal implementations of the frontend-neutral plugin UI requests.
+    module PluginUIRequests
+      def request_plugin_ui(kind, payload, cancellation: nil)
+        cancellation&.raise_if_cancelled!
+        result = case kind.to_sym
+                 when :question then ask_user_question(payload.fetch(:questions))
+                 when :select then request_plugin_select(payload)
+                 when :confirm then request_plugin_confirmation(payload)
+                 when :input then request_plugin_input(payload)
+                 else raise ArgumentError, "unsupported plugin UI request: #{kind}"
+                 end
+        cancellation&.raise_if_cancelled!
+        result
+      end
+
+      private
+
+      def request_plugin_select(payload)
+        options = payload.fetch(:options)
+        labels = options.map { |option| plugin_option_text(option) }
+        selected = with_plugin_ui_modal_state do
+          select(payload[:message] || "Choose an option", labels, title: payload.fetch(:title))
+        end
+        return nil if selected.nil?
+
+        option = options[labels.index(selected)]
+        option && option.fetch(:value)
+      end
+
+      def request_plugin_confirmation(payload)
+        yes = { label: "Yes", description: "Continue." }
+        no = { label: "No", description: "Cancel." }
+        answers = ask_user_question([
+          {
+            header: payload.fetch(:title),
+            question: payload.fetch(:message),
+            options: payload[:default] ? [yes, no] : [no, yes]
+          }
+        ])
+        return false unless answers
+
+        answers.first[:answer].to_s.casecmp?("yes")
+      end
+
+      def request_plugin_input(payload)
+        with_plugin_ui_modal_state do
+          @mutex.synchronize do
+            self.composer_input = payload[:default].to_s
+            self.composer_cursor = composer_input.length
+            @composer.prefill_input = nil
+            @composer.clear_attachments
+            @pending_keys.clear
+            @busy = false
+            @asking = true
+          end
+          label = payload[:placeholder].to_s.empty? ? payload.fetch(:title) : "#{payload.fetch(:title)} · #{payload[:placeholder]}"
+          answer = ask("#{label}>")
+          answer.is_a?(String) ? answer : nil
+        end
+      end
+
+      def with_plugin_ui_modal_state
+        saved_state = @mutex.synchronize do
+          state = begin_question_prompt_state
+          @question_prompt_active = true
+          state
+        end
+        yield
+      ensure
+        finish_question_prompt(saved_state) if saved_state
+      end
+
+      def plugin_option_text(option)
+        description = option[:description].to_s
+        description.empty? ? option.fetch(:label) : "#{option.fetch(:label)} — #{description}"
+      end
+    end
+  end
+end