kward 0.81.0 → 0.83.0

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
@@ -44,14 +48,17 @@ module Kward
       end
 
       def open_project_browser_locked
-        paths = project_file_paths
         saved_state = saved_project_browser_state
+        show_ignored = saved_state["show_ignored"] == true
+        paths = project_file_paths(include_ignored: show_ignored)
         @project_browser_state = {
           paths: paths,
+          show_ignored: show_ignored,
           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 +70,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
@@ -133,6 +144,8 @@ module Kward
             collapse_selected_project_browser_row
           elsif text == "l" && !project_browser_search_active?
             expand_selected_project_browser_row
+          elsif text == "i" && !project_browser_search_active?
+            toggle_project_browser_ignored_files
           elsif project_browser_search_active?
             project_browser_append_search(text)
           else
@@ -164,6 +177,8 @@ module Kward
           project_browser_search_active? ? project_browser_append_search(key) : collapse_selected_project_browser_row
         when "l"
           project_browser_search_active? ? project_browser_append_search(key) : expand_selected_project_browser_row
+        when "i"
+          project_browser_search_active? ? project_browser_append_search(key) : toggle_project_browser_ignored_files
         else
           project_browser_append_search(key) if project_browser_search_active? && printable_key?(key)
         end
@@ -181,6 +196,21 @@ module Kward
         project_browser_search_active? ? deactivate_project_browser_search : activate_project_browser_search
       end
 
+      def toggle_project_browser_ignored_files
+        selected_path = selected_project_browser_row&.[](:path)
+        show_ignored = !project_browser_ignored_files_visible?
+        @project_browser_state[:paths] = project_file_paths(include_ignored: show_ignored)
+        @project_browser_state[:show_ignored] = show_ignored
+        @project_browser_tree_paths = nil
+        @project_browser_tree = nil
+        restore_project_browser_selection(selected_path)
+        persist_project_browser_state
+      end
+
+      def project_browser_ignored_files_visible?
+        @project_browser_state[:show_ignored] == true
+      end
+
       def activate_project_browser_search
         @project_browser_state[:search_active] = true
         @project_browser_state[:query] = ""
@@ -243,6 +273,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 +282,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)
@@ -311,14 +489,17 @@ module Kward
 
         @project_browser_restore_after_editor = false
         unless @project_browser_state
-          paths = project_file_paths
           saved_state = saved_project_browser_state
+          show_ignored = saved_state["show_ignored"] == true
+          paths = project_file_paths(include_ignored: show_ignored)
           @project_browser_state = {
             paths: paths,
+            show_ignored: show_ignored,
             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 +522,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)
@@ -348,7 +530,8 @@ module Kward
 
       def project_browser_title
         query = @project_browser_state[:query].to_s
-        project_browser_search_active? ? "Project files — Search: #{query}" : "Project files"
+        title = project_browser_search_active? ? "Project files — Search: #{query}" : "Project files"
+        project_browser_ignored_files_visible? ? "#{title} (including ignored)" : title
       end
 
       def project_browser_empty_message
@@ -359,7 +542,7 @@ module Kward
         if project_browser_search_active?
           "Type search • Esc tree • Enter open • @ mention"
         else
-          "Enter open/toggle • ←/→ collapse/expand • Tab or / search • @ mention • Esc close"
+          "Enter open/toggle • i show/hide ignored • ←/→ collapse/expand • Tab or / search • @ mention • Esc close"
         end
       end
 
@@ -472,7 +655,8 @@ module Kward
         row = selected_project_browser_row
         workspaces[project_browser_workspace_root] = {
           "expanded" => @project_browser_state[:expanded].to_a.sort,
-          "selected_path" => row && row[:path]
+          "selected_path" => row && row[:path],
+          "show_ignored" => project_browser_ignored_files_visible?
         }
         data["version"] = PROJECT_BROWSER_STATE_VERSION
         data["workspaces"] = workspaces

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
 

data/lib/kward/prompt_interface/runtime_state.rb

@@ -118,8 +118,12 @@ module Kward
         result.is_a?(Hash) && result[:reasoning_action]
       end
 
+      def editor_prompt_action?(result)
+        result.is_a?(Hash) && result[:editor_prompt]
+      end
+
       def prompt_action_result?(result)
-        tab_action_result?(result) || reasoning_action_result?(result)
+        tab_action_result?(result) || reasoning_action_result?(result) || editor_prompt_action?(result)
       end
 
     end

data/lib/kward/prompt_interface/screen.rb

@@ -6,6 +6,28 @@ module Kward
     module Screen
       private
 
+      def terminal_owned_by_child_locked?
+        @terminal_owner == :child
+      end
+
+      def print_output_locked(*values)
+        return if terminal_owned_by_child_locked?
+
+        values.each { |value| @output_io.print(value) }
+      end
+
+      def puts_output_locked(*values)
+        return if terminal_owned_by_child_locked?
+
+        @output_io.puts(*values)
+      end
+
+      def flush_output_locked
+        return if terminal_owned_by_child_locked?
+
+        @output_io.flush
+      end
+
       def enter_raw_mode_locked
         return unless @input_io.respond_to?(:tty?) && @input_io.tty?
         return unless @input_io.respond_to?(:console_mode) && @input_io.respond_to?(:console_mode=)
@@ -31,19 +53,19 @@ module Kward
       end
 
       def with_synchronized_output_locked
-        if @restoring_transcript || @synchronized_output_depth.positive?
+        if @restoring_transcript || @synchronized_output_depth.positive? || terminal_owned_by_child_locked?
           yield
           return
         end
 
         synchronized = true
         @synchronized_output_depth += 1
-        @output_io.print(SYNCHRONIZED_OUTPUT_ENABLE)
+        print_output_locked(SYNCHRONIZED_OUTPUT_ENABLE)
         yield
       ensure
         if synchronized
           @synchronized_output_depth -= 1
-          @output_io.print(SYNCHRONIZED_OUTPUT_DISABLE) if @synchronized_output_depth.zero?
+          print_output_locked(SYNCHRONIZED_OUTPUT_DISABLE) if @synchronized_output_depth.zero?
         end
       end
 
@@ -58,27 +80,28 @@ module Kward
         visible = select_editing_active? if @select_state
         visible = git_composing? if @git_state
         visible = project_browser_search_active? if project_browser_visible?
+        visible = false if image_viewer_active?
         set_cursor_visible_locked(visible)
       end
 
       def set_cursor_visible_locked(visible, force: false)
         return if !force && @cursor_visible == visible
 
-        @output_io.print(visible ? CURSOR_SHOW : CURSOR_HIDE)
+        print_output_locked(visible ? CURSOR_SHOW : CURSOR_HIDE)
         @cursor_visible = visible
       end
 
       def set_editor_bar_cursor_locked
         return if @editor_bar_cursor_active
 
-        @output_io.print(CURSOR_SHAPE_BAR)
+        print_output_locked(CURSOR_SHAPE_BAR)
         @editor_bar_cursor_active = true
       end
 
-      def restore_editor_cursor_shape_locked
-        return unless @editor_bar_cursor_active
+      def restore_editor_cursor_shape_locked(force: false)
+        return unless force || @editor_bar_cursor_active
 
-        @output_io.print(CURSOR_SHAPE_DEFAULT)
+        print_output_locked(CURSOR_SHAPE_DEFAULT)
         @editor_bar_cursor_active = false
       end
 
@@ -87,11 +110,6 @@ module Kward
         ensure_scroll_region_locked(rows.length, width: width, height: height)
       end
 
-      def make_room_for_composer_after_handoff_locked
-        rows, = composer_layout(screen_width, screen_height)
-        @output_io.print("\r\n" * rows.length)
-      end
-
       def ensure_scroll_region_locked(row_count, redraw_transcript: true, width: screen_width, height: screen_height)
         new_reserved_rows = [[row_count, 1].max, [height - 1, 1].max].min
         return if @reserved_rows == new_reserved_rows && @last_height == height
@@ -100,13 +118,15 @@ module Kward
         old_top = [height - old_reserved_rows + 1, 1].max
         @reserved_rows = new_reserved_rows
         new_top = composer_top_row(height)
-        @output_io.print(TerminalSequences.scroll_region(1, transcript_bottom_row(height)))
+        print_output_locked(TerminalSequences.scroll_region(1, transcript_bottom_row(height)))
         clear_screen_rows_locked(old_top, new_top - 1) if new_top > old_top
         @last_composer_rows = []
         redraw_transcript_locked(width: width, height: height) if redraw_transcript && new_reserved_rows < old_reserved_rows
       end
 
       def handle_resize_locked
+        return false if terminal_owned_by_child_locked?
+
         current_width, current_height = screen_size
         return false if current_width == @last_width && current_height == @last_height
 
@@ -127,7 +147,7 @@ module Kward
       end
 
       def restore_scroll_region_locked
-        @output_io.print(TerminalSequences.restore_scroll_region)
+        print_output_locked(TerminalSequences.restore_scroll_region)
         @reserved_rows = 0
       end
 
@@ -143,15 +163,15 @@ module Kward
 
           move_to_screen(top + index, 1)
           if row
-            @output_io.print(row)
+            print_output_locked(row)
           else
-            @output_io.print(TTY::Cursor.clear_line)
+            print_output_locked(TTY::Cursor.clear_line)
           end
         end
 
         rows.length.upto(rows.length + rows_to_clear - 1) do |index|
           move_to_screen(top + index, 1)
-          @output_io.print(TTY::Cursor.clear_line)
+          print_output_locked(TTY::Cursor.clear_line)
         end
 
         @last_composer_rows = rows.dup
@@ -191,12 +211,12 @@ module Kward
       def clear_screen_rows_locked(top, bottom)
         top.upto(bottom) do |row|
           move_to_screen(row, 1)
-          @output_io.print(TTY::Cursor.clear_line)
+          print_output_locked(TTY::Cursor.clear_line)
         end
       end
 
       def move_to_screen(row, col)
-        @output_io.print(TerminalSequences.move_to(row, col))
+        print_output_locked(TerminalSequences.move_to(row, col))
       end
 
       def screen_size

data/lib/kward/prompt_interface/selection_prompt.rb

@@ -324,7 +324,7 @@ module Kward
             @select_state[:selection_index] = result[:selection_index].to_i if result.key?(:selection_index)
           end
           render_prompt_locked
-          @output_io.flush
+          flush_output_locked
         end
         SELECT_CONTINUE
       end
@@ -342,7 +342,7 @@ module Kward
           @asking = true
           reset_spinner_locked
           render_prompt_locked
-          @output_io.flush
+          flush_output_locked
         end
       end
 
@@ -352,7 +352,7 @@ module Kward
           @busy_activity = "streaming"
           @select_state&.delete(:busy_activity)
           render_prompt_locked if @asking
-          @output_io.flush
+          flush_output_locked
         end
       end
 
@@ -362,7 +362,7 @@ module Kward
           spun = tick_spinner_locked
           footer_refreshed = tick_footer_locked
           render_prompt_locked if resized || spun || footer_refreshed
-          @output_io.flush if resized || spun || footer_refreshed
+          flush_output_locked if resized || spun || footer_refreshed
         end
       end
 
@@ -656,7 +656,7 @@ module Kward
           self.composer_cursor = 0
           @asking = true
           render_prompt_locked if render
-          @output_io.flush
+          flush_output_locked
         end
       end
 

data/lib/kward/prompt_interface/transcript_renderer.rb

@@ -19,7 +19,7 @@ module Kward
           @stream_state.finish_block if finish
           restore_composer_cursor_locked unless @restoring_transcript
         end
-        @output_io.flush unless @restoring_transcript
+        flush_output_locked unless @restoring_transcript
       end
 
       def write_transcript_text_locked(text)
@@ -32,7 +32,7 @@ module Kward
         width, height = screen_size
         output_text = terminal_newlines(text.to_s)
         advance_pending_stream_wrap_locked(output_text, width: width, height: height)
-        @output_io.print(output_text)
+        print_output_locked(output_text)
         update_stream_position(output_text, width: width)
       end
 
@@ -58,7 +58,7 @@ module Kward
         return if rows.empty?
 
         move_to_screen(1, 1)
-        @output_io.print(terminal_newlines(rows.join("\n")))
+        print_output_locked(terminal_newlines(rows.join("\n")))
       end
 
       def transcript_viewport_rows(row_count, width)
@@ -98,7 +98,7 @@ module Kward
         return if output_text.empty? || output_text.start_with?("\r", "\n")
 
         move_to_screen(transcript_bottom_row(height), width)
-        @output_io.print("\r\n")
+        print_output_locked("\r\n")
         @stream_state.clear_pending_wrap
       end