kward 0.70.0 → 0.72.0

data/lib/kward/prompt_interface/composer_controller.rb

@@ -26,14 +26,6 @@ module Kward
         @composer.attachments
       end
 
-      def composer_kill_buffer
-        @composer.kill_buffer
-      end
-
-      def composer_kill_buffer=(value)
-        @composer.kill_buffer = value.to_s
-      end
-
       def insert_key(key)
         return unless key.is_a?(String) && key.length == 1 && key.match?(/[[:print:]]/)
 
@@ -44,10 +36,14 @@ module Kward
         return if string.empty?
 
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
         @slash_overlay_dismissed_input = nil
-              @composer.insert_string(string)
-            end
+        @file_overlay_dismissed_token = nil
+        @file_open_dismissed_token = nil
+        @file_editor_open_status = nil
+        @composer.insert_string(string)
+      end
 
       def insert_paste(string)
         parsed = parse_attachments(string)
@@ -70,60 +66,72 @@ module Kward
       end
 
       def add_attachment(attachment)
-              @composer.add_attachment(attachment)
-            end
+        @composer.add_attachment(attachment)
+      end
 
       def delete_before_cursor
-              if @composer.cursor.zero?
+        if @composer.cursor.zero?
           remove_last_attachment
           return
         end
 
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
+        @file_overlay_dismissed_token = nil
+        @file_open_dismissed_token = nil
+        @file_editor_open_status = nil
         @composer.delete_before_cursor
-            end
+      end
 
       def remove_last_attachment
-              return unless @composer.remove_last_attachment
+        return unless @composer.remove_last_attachment
 
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
         @slash_overlay_dismissed_input = nil
-            end
+        @file_overlay_dismissed_token = nil
+        @file_open_dismissed_token = nil
+        @file_editor_open_status = nil
+      end
 
       def delete_at_cursor
-              return unless @composer.cursor < @composer.input.length
+        return unless @composer.cursor < @composer.input.length
 
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
         @slash_overlay_dismissed_input = nil
+        @file_overlay_dismissed_token = nil
+        @file_open_dismissed_token = nil
+        @file_editor_open_status = nil
         @composer.delete_at_cursor
-            end
+      end
 
       def move_cursor_left
-              @composer.move_cursor_left
-            end
+        @composer.move_cursor_left
+      end
 
       def move_cursor_right
-              @composer.move_cursor_right
-            end
+        @composer.move_cursor_right
+      end
 
       def move_to_start_of_line
-              @composer.move_to_start_of_line
-            end
+        @composer.move_to_start_of_line
+      end
 
       def move_to_end_of_line
-              @composer.move_to_end_of_line
-            end
+        @composer.move_to_end_of_line
+      end
 
       def move_to_previous_word
-              @composer.move_to_previous_word
-            end
+        @composer.move_to_previous_word
+      end
 
       def move_to_next_word
-              @composer.move_to_next_word
-            end
+        @composer.move_to_next_word
+      end
 
       def delete_at_cursor_or_exit
         composer_input.empty? ? exit_input : delete_at_cursor
@@ -131,66 +139,93 @@ module Kward
 
       def delete_word_before_cursor
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
-              @composer.delete_word_before_cursor
-            end
+        @file_overlay_dismissed_token = nil
+        @composer.delete_word_before_cursor
+      end
 
       def delete_word_after_cursor
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
-              @composer.delete_word_after_cursor
-            end
+        @file_overlay_dismissed_token = nil
+        @composer.delete_word_after_cursor
+      end
 
       def kill_line_before_cursor
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
-              @composer.kill_line_before_cursor
-            end
+        @file_overlay_dismissed_token = nil
+        @composer.kill_line_before_cursor
+      end
 
       def kill_line_after_cursor
         reset_slash_selection
+        reset_file_selection
         reset_history_navigation
-              @composer.kill_line_after_cursor
-            end
+        @file_overlay_dismissed_token = nil
+        @composer.kill_line_after_cursor
+      end
 
-      def kill_range(start_index, end_index)
-              return unless @composer.kill_range(start_index, end_index)
+      def yank_kill_buffer
+        @composer.yank_kill_buffer
+      end
 
-        reset_slash_selection
-        reset_history_navigation
-            end
+      def load_history(values)
+        @composer.load_history(values)
+      end
 
-      def yank_kill_buffer
-              @composer.yank_kill_buffer
-            end
+      def add_history(value)
+        added = @composer.add_history(value)
+        @prompt_history&.append(value) if added
+        added
+      end
 
-      def previous_word_boundary(index)
-              @composer.previous_word_boundary(index)
+      def recall_previous_history
+        @composer.recall_previous_history
       end
 
-      def next_word_boundary(index)
-              @composer.next_word_boundary(index)
+      def recall_next_history
+        @composer.recall_next_history
       end
 
-      def word_separator?(char)
-        @composer.word_separator?(char)
+      def start_history_search
+        @composer.start_history_search
       end
 
-      def add_history(value)
-              @composer.add_history(value)
-            end
+      def history_search_active?
+        @composer.history_search_active?
+      end
 
-      def recall_previous_history
-              @composer.recall_previous_history
-            end
+      def update_history_search_query(value)
+        @composer.update_history_search_query(value)
+      end
 
-      def recall_next_history
-              @composer.recall_next_history
-            end
+      def history_search_matches
+        @composer.history_search_matches
+      end
+
+      def accept_history_search
+        @composer.accept_history_search
+      end
+
+      def cancel_history_search
+        @composer.cancel_history_search
+      end
+
+      def select_previous_history_search_match
+        @composer.select_previous_history_search_match
+      end
+
+      def select_next_history_search_match
+        @composer.select_next_history_search_match
+      end
 
       def replace_input(value)
         @composer.replace_input(value)
-            end
+      end
 
       def prefill_input(value)
         @mutex.synchronize do
@@ -199,19 +234,41 @@ module Kward
       end
 
       def reset_history_navigation
-              @composer.reset_history_navigation
-            end
+        @composer.reset_history_navigation
+      end
 
+      def reset_history_search
+        @composer.reset_history_search
+      end
+
+      def prepare_modal_input_locked(label, clear_attachments: false)
+        @prompt_label = label.to_s
+        self.composer_input = ""
+        self.composer_cursor = 0
+        @composer.clear_attachments if clear_attachments
+        @pending_keys.clear
+        @asking = true
+        @busy = false
+        @queued_count = 0
+        reset_history_navigation
+      end
 
       def submit_input
         value = submitted_input
         add_history(composer_input)
+        clear_finished_input_locked(reset_history: true)
+        @output_io.flush
+        value
+      end
+
+      def clear_finished_input_locked(reset_history: false)
         if @busy
           clear_prompt_for_output_locked
           self.composer_input = ""
           self.composer_cursor = 0
           @composer.clear_attachments
-          reset_history_navigation
+          reset_history_navigation if reset_history
+          reset_history_search if reset_history
           @asking = true
           render_prompt_after_output_locked
         else
@@ -219,12 +276,11 @@ module Kward
           self.composer_input = ""
           self.composer_cursor = 0
           @composer.clear_attachments
+          reset_history_search if reset_history
           @asking = false
           @rendered_rows = 0
           @cursor_rendered_row = 0
         end
-        @output_io.flush
-        value
       end
 
       def submitted_input
@@ -237,22 +293,7 @@ module Kward
       end
 
       def exit_input
-        if @busy
-          clear_prompt_for_output_locked
-          self.composer_input = ""
-          self.composer_cursor = 0
-          @composer.clear_attachments
-          @asking = true
-          render_prompt_after_output_locked
-        else
-          clear_prompt_locked
-          self.composer_input = ""
-          self.composer_cursor = 0
-          @composer.clear_attachments
-          @asking = false
-          @rendered_rows = 0
-          @cursor_rendered_row = 0
-        end
+        clear_finished_input_locked
         @output_io.flush
         EXIT_INPUT
       end

data/lib/kward/prompt_interface/composer_renderer.rb

@@ -7,6 +7,8 @@ module Kward
       private
 
       def composer_layout(width, height = screen_height)
+        return interactive_layout(width, height) if interactive_active_locked?
+        return editor_layout(width, height) if editor_active?
         return compact_composer_layout(width) if height < 4
         return question_composer_layout(width, height) if @question_state
 
@@ -22,7 +24,11 @@ module Kward
         rows.concat(attachment_rows)
         rows.concat(visible_rows.map { |row| box_content_row(row, content_width) })
         rows << footer_row(content_width, footer_text) unless footer_text.empty?
-        rows << bottom_border(width)
+        if @tabs.empty?
+          rows << bottom_border(width)
+        else
+          rows.concat(tab_border_rows(width))
+        end
         cursor_row = overlay_rows.length + 1 + attachment_rows.length + input_cursor_row - visible_start
         cursor_col = 2 + [input_cursor_col, content_width - 1].min
         [rows, cursor_row, cursor_col]
@@ -73,7 +79,7 @@ module Kward
 
       def top_border(width)
         title = composer_title
-        status = composer_status_text
+        status = cached_composer_status_text
         if status
           gap = width - 2 - ANSI.strip(title).length - ANSI.strip(status).length
           if gap >= 0
@@ -85,7 +91,7 @@ module Kward
       end
 
       def composer_title
-        label = @prompt_label.delete_suffix(">")
+        label = composer_title_label
         if @busy && @queued_count.positive?
           status_composer_text(busy_title("#{label} · #{@queued_count} queued"))
         elsif @busy && @steered_count.to_i.positive?
@@ -97,15 +103,14 @@ module Kward
         end
       end
 
-      def busy_title(text)
-        @busy_help ? "#{text} · #{BUSY_HELP_TEXT}" : text
-      end
+      def composer_title_label
+        return "Search" if @select_state && select_search_active?
 
-      def composer_status_text
-        text = @composer_status&.call.to_s
-        return nil if text.empty?
+        @prompt_label.delete_suffix(">")
+      end
 
-        status_composer_text(text)
+      def busy_title(text)
+        @busy_help ? "#{text} · #{BUSY_HELP_TEXT}" : text
       end
 
       def status_composer_text(text)
@@ -116,8 +121,106 @@ module Kward
         colored("╰#{"─" * [width - 2, 0].max}╯", :primary_green)
       end
 
+      def tab_border_rows(width)
+        return [bottom_border(width)] if width < 10
+
+        slots = tab_slots
+        active_slot = slots[@active_tab_index]
+        return [bottom_border(width)] unless active_slot
+        return [bottom_border(width)] if active_slot[:left] + active_slot[:width] > width
+
+        [
+          color_tab_border(bottom_tab_border_row(width, active_slot)),
+          color_tab_border(tab_bar_row(width, slots, active_slot)),
+          color_tab_border(active_tab_bottom_row(width, active_slot))
+        ]
+      end
+
+      def tab_slots
+        label_left = 4
+        @tabs.each_with_index.map do |label, index|
+          text = tab_label(label, index)
+          width = ANSI.strip(text).length
+          slot = {
+            left: label_left - 2,
+            label_left: label_left,
+            label: text,
+            inner_width: width + 2,
+            width: width + 4
+          }
+          label_left += width + 3
+          slot
+        end
+      end
+
+      def bottom_tab_border_row(width, active_slot)
+        row = Array.new(width, " ")
+        place_string(row, 0, "╰#{"─" * [active_slot[:left] - 1, 0].max}╮")
+        place_string(row, active_slot[:left] + active_slot[:inner_width] + 1, "╭")
+        place_string(row, active_slot[:left] + active_slot[:inner_width] + 2, "─" * [width - active_slot[:left] - active_slot[:inner_width] - 3, 0].max)
+        place_string(row, width - 1, "╯")
+        row.join
+      end
+
+      def tab_bar_row(width, slots, active_slot)
+        row = Array.new(width, " ")
+        slots.each do |slot|
+          if slot == active_slot
+            place_string(row, slot[:left], "│ #{slot[:label]} │")
+          else
+            place_string(row, slot[:label_left], slot[:label])
+          end
+        end
+        row.join
+      end
+
+      def active_tab_bottom_row(width, active_slot)
+        row = Array.new(width, " ")
+        place_string(row, active_slot[:left], "╰#{"─" * active_slot[:inner_width]}╯")
+        row.join
+      end
+
+      def place_string(row, left, text)
+        return if left >= row.length
+
+        visible_offset = 0
+        last_index = nil
+        text.to_s.scan(/\e\[[0-9;:]*m|./m).each do |part|
+          if part.start_with?("\e")
+            index = visible_offset.positive? ? last_index : left
+            row[index] = row[index].to_s + part if index&.between?(0, row.length - 1)
+            next
+          end
+
+          index = left + visible_offset
+          break if index >= row.length
+          row[index] = row[index].to_s.sub(/\A /, "") + part unless index.negative?
+          last_index = index
+          visible_offset += 1
+        end
+      end
+
+      def tab_label(label, index)
+        tab = normalize_tab_label(label)
+        name = tab[:name].empty? ? "Tab" : tab[:name]
+        color = tab[:color]
+        name = colored(name, color) if color
+        "#{index + 1} #{name}"
+      end
+
+      def normalize_tab_label(label)
+        return { name: label[:name].to_s, color: label[:color] } if label.is_a?(Hash)
+
+        { name: label.to_s, color: nil }
+      end
+
+      def color_tab_border(row)
+        row.gsub(/[╰╯╭╮│─]/) { |char| colored(char, :primary_green) }
+      end
+
       def box_content_row(row, content_width)
-        "#{colored("│", :primary_green)} #{row[0, content_width].to_s.ljust(content_width)} #{colored("│", :primary_green)}"
+        content = visible_ljust(visible_truncate(row, content_width), content_width)
+        "#{colored("│", :primary_green)} #{content} #{colored("│", :primary_green)}"
       end
 
       def footer_row(content_width, text = footer_text)
@@ -148,7 +251,7 @@ module Kward
         []
       end
 
-      def max_visible_input_rows(attachment_count = 0, overlay_count = active_overlay_rows(screen_width).length, footer_count = footer_text.to_s.empty? ? 0 : 1, height: screen_height)
+      def max_visible_input_rows(attachment_count, overlay_count, footer_count, height: screen_height)
         input_cap = [COMPOSER_MAX_INPUT_ROWS - attachment_count, 1].max
         [[input_cap, height - 3 - overlay_count - footer_count - attachment_count].min, 1].max
       end
@@ -163,8 +266,7 @@ module Kward
       end
 
       def cursor_logical_position
-        before_cursor = composer_input[0...composer_cursor]
-        [before_cursor.count("\n"), (before_cursor.split("\n", -1).last || "").length]
+        @composer.cursor_logical_position
       end
 
     end

data/lib/kward/prompt_interface/composer_state.rb

@@ -1,3 +1,5 @@
+require_relative "../text_boundary"
+
 # Namespace for the Kward CLI agent runtime.
 module Kward
   # Interactive terminal UI used by the CLI frontend.
@@ -16,6 +18,12 @@ module Kward
       attr_accessor :history_draft
       # @return [String, nil] text queued for the next composer prompt
       attr_accessor :prefill_input
+      # @return [String, nil] query typed while searching history
+      attr_accessor :history_search_query
+      # @return [String, nil] draft restored after canceling history search
+      attr_accessor :history_search_draft
+      # @return [Integer] active selection index while searching history
+      attr_accessor :history_search_index
       # @return [Array<Hash>] pending image/file attachments submitted with the next turn
       attr_reader :attachments
       # @return [Array<String>] submitted input history
@@ -30,6 +38,9 @@ module Kward
         @history_index = nil
         @history_draft = nil
         @prefill_input = nil
+        @history_search_query = nil
+        @history_search_draft = nil
+        @history_search_index = 0
       end
 
       # Removes all pending attachments without changing text input.
@@ -104,22 +115,22 @@ module Kward
 
       # Moves the cursor to the previous word boundary.
       def move_to_previous_word
-        @cursor = previous_word_boundary(@cursor)
+        @cursor = TextBoundary.previous_word_boundary(@input, @cursor)
       end
 
       # Moves the cursor to the next word boundary.
       def move_to_next_word
-        @cursor = next_word_boundary(@cursor)
+        @cursor = TextBoundary.next_word_boundary(@input, @cursor)
       end
 
       # Kills the word before the cursor into `kill_buffer`.
       def delete_word_before_cursor
-        kill_range(previous_word_boundary(@cursor), @cursor)
+        kill_range(TextBoundary.previous_word_boundary(@input, @cursor), @cursor)
       end
 
       # Kills the word after the cursor into `kill_buffer`.
       def delete_word_after_cursor
-        kill_range(@cursor, next_word_boundary(@cursor))
+        kill_range(@cursor, TextBoundary.next_word_boundary(@input, @cursor))
       end
 
       # Kills all text before the cursor into `kill_buffer`.
@@ -147,27 +158,6 @@ module Kward
         insert_string(@kill_buffer.to_s) unless @kill_buffer.to_s.empty?
       end
 
-      # Finds the start offset of the word before `index`.
-      def previous_word_boundary(index)
-        cursor = index
-        cursor -= 1 while cursor.positive? && word_separator?(@input[cursor - 1])
-        cursor -= 1 while cursor.positive? && !word_separator?(@input[cursor - 1])
-        cursor
-      end
-
-      # Finds the end offset of the word after `index`.
-      def next_word_boundary(index)
-        cursor = index
-        cursor += 1 while cursor < @input.length && word_separator?(@input[cursor])
-        cursor += 1 while cursor < @input.length && !word_separator?(@input[cursor])
-        cursor
-      end
-
-      # Treats whitespace as the only word separator for composer navigation.
-      def word_separator?(char)
-        char.to_s.match?(/\s/)
-      end
-
       # Replaces the full input buffer and places the cursor at the end.
       def replace_input(value)
         @input = value.to_s
@@ -180,13 +170,21 @@ module Kward
         [before_cursor.count("\n"), (before_cursor.split("\n", -1).last || "").length]
       end
 
+      # Replaces the in-memory history list with persisted entries.
+      def load_history(values)
+        @history = Array(values).map(&:to_s).reject { |value| value.strip.empty? }
+        reset_history_navigation
+        reset_history_search
+      end
+
       # Stores a submitted input unless it is blank or duplicates the previous entry.
       def add_history(value)
         stripped = value.to_s.strip
-        return if stripped.empty?
-        return if @history.last == value
+        return false if stripped.empty?
+        return false if @history.last == value
 
         @history << value
+        true
       end
 
       # Replaces input with the previous history entry, preserving the draft first.
@@ -216,6 +214,77 @@ module Kward
         @history_index = nil
         @history_draft = nil
       end
+
+      def start_history_search
+        @history_search_draft = @input if @history_search_query.nil?
+        @history_search_query = @input.to_s
+        @history_search_index = 0
+        replace_input(@history_search_query)
+      end
+
+      def history_search_active?
+        !@history_search_query.nil?
+      end
+
+      def update_history_search_query(value)
+        @history_search_query = value.to_s
+        @history_search_index = 0
+        replace_input(@history_search_query)
+      end
+
+      def history_search_matches
+        query = @history_search_query.to_s.downcase
+        return @history.reverse if query.empty?
+
+        @history.reverse.select { |value| fuzzy_history_match?(value.downcase, query) }
+      end
+
+      def selected_history_search_match
+        matches = history_search_matches
+        return nil if matches.empty?
+
+        matches[[@history_search_index, matches.length - 1].min]
+      end
+
+      def select_previous_history_search_match
+        @history_search_index = [@history_search_index - 1, 0].max
+      end
+
+      def select_next_history_search_match
+        matches = history_search_matches
+        return if matches.empty?
+
+        @history_search_index = [@history_search_index + 1, matches.length - 1].min
+      end
+
+      def accept_history_search
+        match = selected_history_search_match
+        replace_input(match) if match
+        reset_history_search
+      end
+
+      def cancel_history_search
+        replace_input(@history_search_draft.to_s)
+        reset_history_search
+      end
+
+      def reset_history_search
+        @history_search_query = nil
+        @history_search_draft = nil
+        @history_search_index = 0
+      end
+
+      def fuzzy_history_match?(value, query)
+        query.chars.all? do |char|
+          index = value.index(char)
+          if index
+            value = value[(index + 1)..].to_s
+            true
+          else
+            false
+          end
+        end
+      end
     end
   end
 end