kward 0.80.1 → 0.82.0

data/lib/kward/prompt_interface/key_handler.rb

@@ -27,15 +27,40 @@ module Kward
         result.is_a?(String) ? true : result
       end
 
+      def handle_image_viewer_key(key)
+        return true if handle_bundled_key(key) { |token| handle_image_viewer_key(token) }
+
+        sequence = parse_csi_u_key(key)
+        if sequence
+          queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
+          return close_image_viewer if sequence[:code] == 27
+
+          text = csi_u_printable_text(sequence)
+          return zoom_image_viewer(:in) if text == "+"
+          return zoom_image_viewer(:out) if text == "-"
+          return true
+        end
+
+        return zoom_image_viewer(:in) if key == "+"
+        return zoom_image_viewer(:out) if key == "-"
+
+        close_image_viewer if key == "\e" || key == "q" || key == "Q"
+        true
+      end
+
       def handle_key(key)
         return submit_input if key.nil?
         return handle_interactive_key(key) if interactive_active_locked?
+        return handle_image_viewer_key(key) if image_viewer_active?
         return handle_editor_input_key(key) if editor_active?
         return handle_project_browser_key(key) if project_browser_visible?
         return handle_history_search_key(key) if history_search_active?
         return true if handle_mouse_reporting_key(key)
         return if handle_bracketed_paste_key(key)
 
+        completion_overlay_result = handle_completion_overlay_key(key)
+        return completion_overlay_result unless completion_overlay_result == false
+
         csi_result = handle_csi_u_key(key)
         return csi_result unless csi_result == false
         return if handle_shift_enter_key(key)
@@ -44,9 +69,6 @@ module Kward
         completion_result = handle_completion_provider_key(key)
         return completion_result unless completion_result == false
 
-        reasoning_result = handle_reasoning_key_binding(key)
-        return reasoning_result unless reasoning_result == false
-
         tab_result = handle_tab_key_binding(key)
         return tab_result unless tab_result == false
 
@@ -81,7 +103,7 @@ module Kward
         when :ctrl_y
           yank_kill_buffer
         when :ctrl_l
-          redraw_screen_locked
+          request_transcript_redraw
         when :ctrl_r
           start_history_search
         when :left
@@ -212,9 +234,6 @@ module Kward
         return true if sequence == "\e" && (dismiss_file_overlay || dismiss_slash_overlay)
         return true if handle_shift_enter_key(sequence)
 
-        reasoning_result = handle_reasoning_key_binding(sequence)
-        return reasoning_result unless reasoning_result == false
-
         tab_result = handle_tab_key_binding(sequence)
         return tab_result unless tab_result == false
 
@@ -323,10 +342,10 @@ module Kward
           if ctrl_modifier?(modifier)
             shift_modifier?(modifier) ? { tab_action: :previous } : { tab_action: :next }
           elsif shift_modifier?(modifier)
-            handle_reasoning_key_binding(key) || handle_tab_completion_key
+            handle_tab_completion_key
           else
             completion_result = handle_completion_provider_key("\t")
-            completion_result == false ? handle_reasoning_key_binding("\t") || handle_tab_completion_key : completion_result
+            completion_result == false ? handle_tab_completion_key : completion_result
           end
         when 13
           if modifier == 2
@@ -447,7 +466,7 @@ module Kward
           when 107
             kill_line_after_cursor
           when 108
-            redraw_screen_locked
+            request_transcript_redraw
           when 114
             start_history_search
           when 117
@@ -580,61 +599,99 @@ module Kward
 
       CTRL_TAB_SEQUENCES = TerminalKeys::CTRL_TAB
       CTRL_SHIFT_TAB_SEQUENCES = TerminalKeys::CTRL_SHIFT_TAB
-      SHIFT_TAB_SEQUENCES = TerminalKeys::SHIFT_TAB
+
+      def handle_completion_overlay_key(key)
+        return false unless @completion_overlay
+
+        return handle_completion_provider_key("\t") if completion_tab_key?(key)
+
+        dismiss_completion_overlay
+        false
+      end
+
+      def completion_tab_key?(key)
+        return true if key == "\t"
+
+        sequence = parse_csi_u_key(key)
+        return false unless sequence && sequence[:code] == 9
+
+        completion = !ctrl_modifier?(sequence[:modifier]) && !shift_modifier?(sequence[:modifier])
+        queue_pending_keys(sequence[:remaining]) if completion && sequence[:remaining] && !sequence[:remaining].empty?
+        completion
+      end
+
+      def dismiss_completion_overlay
+        @completion_overlay = nil
+        @completion_cycle = nil
+      end
 
       def handle_completion_provider_key(key)
         return false unless key == "\t" && @completion_provider
 
+        if (cycle = matching_completion_cycle)
+          cycle_completion(cycle)
+          return true
+        end
+
         result = @completion_provider.call(composer_input, composer_cursor)
+        return false if result == false
         return true unless result
 
         apply_completion_result(result)
         true
       end
 
+      def matching_completion_cycle
+        cycle = @completion_cycle
+        return nil unless cycle
+        return cycle if cycle[:input] == composer_input && cycle[:cursor] == composer_cursor
+
+        @completion_cycle = nil
+        @completion_overlay = nil
+        nil
+      end
+
+      def cycle_completion(cycle)
+        cycle[:index] = (cycle[:index] + 1) % cycle[:candidates].length
+        apply_completion_cycle_candidate(cycle)
+      end
+
       def apply_completion_result(result)
         range = result[:range] || result["range"] || result.range
         replacement = result[:replacement] || result["replacement"] || result.replacement
-        candidates = result[:candidates] || result["candidates"] || result.candidates
+        candidates = (result[:candidates] || result["candidates"] || result.candidates).to_a
         original = composer_input
         before = original[0...range.begin].to_s
         after = original[range.end..].to_s
+
+        if candidates.length > 1
+          @completion_cycle = {
+            candidates: candidates.map(&:to_s),
+            index: 0,
+            before: before,
+            after: after
+          }
+          apply_completion_cycle_candidate(@completion_cycle)
+          show_completion_overlay(candidates)
+          return
+        end
+
+        @completion_cycle = nil
         self.composer_input = "#{before}#{replacement}#{after}"
         self.composer_cursor = before.length + replacement.to_s.length
-        show_completion_candidates(candidates, replacement) if candidates.to_a.length > 1 && replacement.to_s == original[range]
       end
 
-      def show_completion_candidates(candidates, replacement)
-        lines = candidates.to_a.first(40)
-        text = ["completions:", *lines.map { |candidate| "  #{candidate}" }].join("\n")
-        write_completion_transcript_locked(text)
-      end
-
-      def write_completion_transcript_locked(text)
-        with_synchronized_output_locked do
-          clear_prompt_for_output_locked
-          write_transcript_text_locked("\n#{text}\n")
-          render_prompt_after_output_locked
-        end
+      def show_completion_overlay(candidates)
+        @completion_overlay = { candidates: candidates.map(&:to_s), index: 0 }
       end
 
-      def handle_reasoning_key_binding(key)
-        return false if @busy || @select_state || @question_state
-        return false if file_overlay_visible? || slash_overlay_visible?
-        return false if @slash_overlay_dismissed_input && @slash_overlay_dismissed_input == composer_input
-        mention_token = active_file_mention_token
-        open_token = active_file_open_token
-        return false if mention_token && @file_overlay_dismissed_token == mention_token
-        return false if open_token && @file_open_dismissed_token == open_token
-
-        case key
-        when "\t"
-          { reasoning_action: :next }
-        when *SHIFT_TAB_SEQUENCES
-          { reasoning_action: :previous }
-        else
-          false
-        end
+      def apply_completion_cycle_candidate(cycle)
+        replacement = cycle[:candidates][cycle[:index]]
+        self.composer_input = "#{cycle[:before]}#{replacement}#{cycle[:after]}"
+        self.composer_cursor = cycle[:before].length + replacement.length
+        @completion_overlay[:index] = cycle[:index] if @completion_overlay
+        cycle[:input] = composer_input
+        cycle[:cursor] = composer_cursor
       end
 
       def handle_tab_key_binding(key)
@@ -710,7 +767,7 @@ module Kward
         when TerminalKeys::CTRL_K
           kill_line_after_cursor
         when TerminalKeys::CTRL_L
-          redraw_screen_locked
+          request_transcript_redraw
         when TerminalKeys::CTRL_U
           kill_line_before_cursor
         when TerminalKeys::CTRL_W

data/lib/kward/prompt_interface/overlay_renderer.rb

@@ -10,13 +10,26 @@ module Kward
         return question_overlay_rows(width) if @question_state
         return selection_overlay_rows(width, height: height) if @select_state
         return git_overlay_rows(width, height: height) if @git_state
+        return image_viewer_rows(width, height: height) if image_viewer_active?
         return project_browser_rows(width, height: height) if project_browser_visible?
+        return completion_overlay_rows(width, height: height) if @completion_overlay
         return history_search_overlay_rows(width, height: height) if history_search_active?
         return file_overlay_rows(width, height: height) if file_overlay_visible?
 
         slash_overlay_rows(width, height: height)
       end
 
+      def completion_overlay_rows(width, height: screen_height)
+        candidates = @completion_overlay[:candidates]
+        max_rows = max_overlay_list_rows(height)
+        selected = @completion_overlay[:index].to_i
+        start = centered_list_window_start(selected, candidates.length, max_rows)
+        rows = (candidates[start, max_rows] || []).each_with_index.map do |candidate, offset|
+          overlay_choice_line(candidate, selected: start + offset == selected)
+        end
+        overlay_card_rows("Completions", rows, width)
+      end
+
       def history_search_overlay_rows(width, height: screen_height)
         matches = history_search_matches
         if matches.empty?

data/lib/kward/prompt_interface/project_browser.rb

@@ -34,6 +34,10 @@ module Kward
       }.freeze
       PROJECT_BROWSER_DIRECTORY_ICON = ""
       PROJECT_BROWSER_FILE_ICON = ""
+      IMAGE_VIEWER_CELL_HEIGHT_TO_WIDTH = 2.0
+      IMAGE_VIEWER_ZOOM_STEP = 0.25
+      IMAGE_VIEWER_MIN_ZOOM = 0.25
+      IMAGE_VIEWER_MAX_ZOOM = 4.0
 
       def open_project_browser
         @mutex.synchronize do
@@ -51,7 +55,8 @@ module Kward
           expanded: restored_project_browser_expanded_paths(paths, saved_state),
           selection_index: 0,
           search_active: false,
-          query: ""
+          query: "",
+          status: nil
         }
         restore_project_browser_selection(saved_state["selected_path"])
         self.composer_input = ""
@@ -63,7 +68,11 @@ module Kward
       private
 
       def project_browser_visible?
-        !@project_browser_state.nil? && !editor_active?
+        !@project_browser_state.nil? && !editor_active? && !image_viewer_active?
+      end
+
+      def image_viewer_active?
+        !@image_viewer_state.nil?
       end
 
       def dismiss_project_browser
@@ -243,6 +252,8 @@ module Kward
         if row[:directory]
           toggle_project_browser_directory(row[:path])
           true
+        elsif Kward::ImageAttachments.image_extension?(row[:path])
+          open_project_browser_image(row[:path])
         else
           persist_project_browser_state unless project_browser_search_active?
           @project_browser_restore_after_editor = true if open_editor(row[:path])
@@ -250,6 +261,152 @@ module Kward
         end
       end
 
+      def open_project_browser_image(path)
+        full_path = File.expand_path(path.to_s, prompt_workspace_root)
+        part = Kward::ImageAttachments.image_part_from_path(full_path)
+        unless part
+          @project_browser_state[:status] = "Cannot preview #{path}: unreadable or larger than 20 MB"
+          return false
+        end
+
+        protocol = terminal_image_protocol
+        unless protocol
+          @project_browser_state[:status] = "Cannot preview #{path}: terminal does not support inline images"
+          return false
+        end
+
+        part = Kward::ImageAttachments.terminal_image_part(part, protocol)
+        unless part
+          @project_browser_state[:status] = "Cannot preview #{path}: terminal cannot render this image format"
+          return false
+        end
+
+        image_id = next_terminal_image_id
+        columns = image_viewer_columns(screen_width)
+        rows = image_viewer_preview_rows(screen_height, width: screen_width)
+        terminal_columns, terminal_rows = image_viewer_terminal_size(part, protocol, columns, rows)
+        sequence = Kward::ImageAttachments.terminal_image_sequence(
+          part,
+          width: terminal_columns,
+          height: terminal_rows,
+          protocol: protocol,
+          image_id: image_id,
+          move_cursor: false,
+          env: ENV
+        )
+        unless sequence
+          @project_browser_state[:status] = "Cannot preview #{path}: terminal cannot render this image format"
+          return false
+        end
+
+        @image_viewer_state = {
+          path: full_path,
+          display_path: path.to_s,
+          protocol: protocol,
+          image_id: image_id,
+          part: part,
+          zoom: 1.0,
+          columns: columns,
+          rows: rows,
+          sequence: sequence
+        }
+        @pending_keys.clear
+        @asking = true
+        true
+      end
+
+      def close_image_viewer
+        return false unless image_viewer_active?
+
+        clear_image_viewer_output_locked
+        @image_viewer_state = nil
+        sync_project_browser_query_input
+        @asking = true
+        true
+      end
+
+      def terminal_image_protocol
+        return @terminal_image_protocol if @terminal_image_protocol
+
+        detected = TerminalImageSupport.detect(input: @input_io, output: @output_io)
+        @terminal_image_protocol = detected if detected
+        detected
+      end
+
+      def next_terminal_image_id
+        @next_terminal_image_id ||= 0
+        @next_terminal_image_id += 1
+        @next_terminal_image_id = 1 if @next_terminal_image_id > 4_294_967_295
+        @next_terminal_image_id
+      end
+
+      def image_viewer_zoom
+        @image_viewer_state&.fetch(:zoom, 1.0) || 1.0
+      end
+
+      def zoom_image_viewer(direction)
+        return false unless image_viewer_active?
+
+        delta = direction == :in ? IMAGE_VIEWER_ZOOM_STEP : -IMAGE_VIEWER_ZOOM_STEP
+        zoom = [[image_viewer_zoom + delta, IMAGE_VIEWER_MIN_ZOOM].max, IMAGE_VIEWER_MAX_ZOOM].min
+        @image_viewer_state[:zoom] = zoom.round(2)
+        @asking = true
+        true
+      end
+
+      def image_viewer_columns(width = screen_width)
+        available_columns = [width - 4, 1].max
+        desired_columns = [(ImageAttachments::DEFAULT_TERMINAL_IMAGE_WIDTH.to_i * image_viewer_zoom).round, 1].max
+        [desired_columns, available_columns].min
+      end
+
+      def image_viewer_sequence(width, height)
+        columns = image_viewer_columns(width)
+        rows = image_viewer_preview_rows(height, width: width)
+        state = @image_viewer_state
+        return state[:sequence] if state[:columns] == columns && state[:rows] == rows
+
+        terminal_columns, terminal_rows = image_viewer_terminal_size(state[:part], state[:protocol], columns, rows)
+        state[:columns] = columns
+        state[:rows] = rows
+        sequence = Kward::ImageAttachments.terminal_image_sequence(
+          state[:part],
+          width: terminal_columns,
+          height: terminal_rows,
+          protocol: state[:protocol],
+          image_id: state[:image_id],
+          move_cursor: false,
+          env: ENV
+        )
+        delete_sequence = image_viewer_delete_sequence(state[:image_id]) if state[:protocol] == TerminalImageSupport::KITTY
+        state[:sequence] = "#{delete_sequence}#{sequence}"
+      end
+
+      def image_viewer_terminal_size(part, protocol, columns, rows)
+        return [columns, rows] unless protocol == TerminalImageSupport::KITTY
+
+        dimensions = Kward::ImageAttachments.png_dimensions(part)
+        return [nil, rows] unless dimensions
+
+        image_width, image_height = dimensions
+        image_aspect_ratio = image_width.to_f / image_height
+        available_aspect_ratio = columns.to_f / (rows * IMAGE_VIEWER_CELL_HEIGHT_TO_WIDTH)
+        image_aspect_ratio > available_aspect_ratio ? [columns, nil] : [nil, rows]
+      end
+
+      def image_viewer_delete_sequence(image_id)
+        sequence = TerminalSequences.kitty_delete(image_id)
+        ENV["TMUX"].to_s.empty? ? sequence : TerminalSequences.tmux_passthrough(sequence)
+      end
+
+      def clear_image_viewer_output_locked
+        return unless image_viewer_active?
+        return unless @image_viewer_state[:protocol] == TerminalImageSupport::KITTY
+        return unless @started
+
+        print_output_locked(image_viewer_delete_sequence(@image_viewer_state[:image_id]))
+      end
+
       def expand_selected_project_browser_row
         row = selected_project_browser_row
         return false unless row&.fetch(:directory, false)
@@ -318,7 +475,8 @@ module Kward
             expanded: restored_project_browser_expanded_paths(paths, saved_state),
             selection_index: 0,
             search_active: false,
-            query: ""
+            query: "",
+            status: nil
           }
           restore_project_browser_selection(saved_state["selected_path"])
         end
@@ -341,6 +499,7 @@ module Kward
             lines << overlay_choice_line(project_browser_row_text(row), selected: index == @project_browser_state[:selection_index])
           end
         end
+        lines << overlay_text_line(@project_browser_state[:status], :muted) if @project_browser_state[:status]
         lines << overlay_blank_line
         lines << overlay_text_line(project_browser_help_text, :muted)
         overlay_card_rows(title, lines, width)

data/lib/kward/prompt_interface/prompt_renderer.rb

@@ -7,12 +7,12 @@ module Kward
       private
 
       def render_prompt_locked(synchronized: false)
-        return unless @started && @asking
+        return unless @started && @asking && !terminal_owned_by_child_locked?
 
         width, height = screen_size
         if width != @last_width || height != @last_height
           with_synchronized_output_locked { render_prompt_body_locked }
-          @output_io.flush
+          flush_output_locked
           return
         end
 
@@ -23,10 +23,12 @@ module Kward
         else
           render_prompt_layout_locked(rows, cursor_row, cursor_col, width, height)
         end
-        @output_io.flush
+        flush_output_locked
       end
 
       def render_prompt_body_locked
+        return if terminal_owned_by_child_locked?
+
         handle_resize_locked
         width, height = screen_size
         rows, cursor_row, cursor_col = composer_layout(width, height)
@@ -49,6 +51,8 @@ module Kward
       end
 
       def clear_prompt_locked
+        return if terminal_owned_by_child_locked?
+
         handle_resize_locked
         width, height = screen_size
         clear_composer_region_locked(height: height)
@@ -58,6 +62,8 @@ module Kward
       end
 
       def clear_prompt_for_output_locked
+        return if terminal_owned_by_child_locked?
+
         handle_resize_locked
         width, height = screen_size
         reserve_composer_region_locked(width: width, height: height) if @started && @asking
@@ -68,6 +74,8 @@ module Kward
       end
 
       def prepare_transcript_output_locked
+        return if terminal_owned_by_child_locked?
+
         handle_resize_locked
         width, height = screen_size
         hide_cursor_for_transcript_output_locked
@@ -76,7 +84,7 @@ module Kward
       end
 
       def restore_composer_cursor_locked
-        return unless @started && @asking
+        return unless @started && @asking && !terminal_owned_by_child_locked?
 
         width, height = screen_size
         _rows, cursor_row, cursor_col = composer_layout(width, height)
@@ -85,10 +93,11 @@ module Kward
       end
 
       def redraw_screen_locked(width: screen_width, height: screen_height)
-        return unless @started
+        return unless @started && !terminal_owned_by_child_locked?
 
+        clear_image_viewer_output_locked if image_viewer_active?
         restore_scroll_region_locked
-        @output_io.print(TTY::Cursor.clear_screen)
+        print_output_locked(TTY::Cursor.clear_screen)
         move_to_screen(1, 1)
         @reserved_rows = 0
         @last_composer_rows = []

data/lib/kward/prompt_interface/question_prompt.rb

@@ -76,7 +76,7 @@ module Kward
           @steered_count = saved_state[:steered_count]
           @pending_keys = saved_state[:pending_keys]
           render_prompt_locked if @started && @asking
-          @output_io.flush
+          flush_output_locked
         end
       end