kward 0.81.0 → 0.83.0

data/lib/kward/project_files.rb

@@ -8,21 +8,34 @@ module Kward
   module ProjectFiles
     module_function
 
-    def list(root: Dir.pwd)
-      paths = git_paths(root)
-      paths = scanned_paths(root) if paths.empty?
+    def list(root: Dir.pwd, include_ignored: false)
+      paths = git_paths(root, include_ignored: include_ignored)
+      paths = scanned_paths(root) if paths.empty? && !git_repository?(root)
       paths.reject { |path| path.empty? || path.end_with?("/") }.uniq.sort
     end
 
-    def git_paths(root)
+    def git_paths(root, include_ignored: false)
       output, status = Open3.capture2("git", "ls-files", "--cached", "--others", "--exclude-standard", chdir: root)
       return [] unless status.success?
 
-      output.lines.map(&:chomp).reject(&:empty?)
+      paths = output.lines.map(&:chomp).reject(&:empty?)
+      return paths unless include_ignored
+
+      ignored_output, ignored_status = Open3.capture2("git", "ls-files", "--others", "--ignored", "--exclude-standard", chdir: root)
+      return paths unless ignored_status.success?
+
+      paths + ignored_output.lines.map(&:chomp).reject(&:empty?)
     rescue StandardError
       []
     end
 
+    def git_repository?(root)
+      _output, status = Open3.capture2e("git", "rev-parse", "--is-inside-work-tree", chdir: root)
+      status.success?
+    rescue StandardError
+      false
+    end
+
     def scanned_paths(root)
       root_path = Pathname.new(root)
       paths = []

data/lib/kward/prompt_interface/composer_controller.rb

@@ -257,12 +257,12 @@ module Kward
         value = submitted_input
         add_history(composer_input)
         if !@busy && value.strip.empty?
-          @output_io.flush
+          flush_output_locked
           return value
         end
 
         clear_submitted_input_locked
-        @output_io.flush
+        flush_output_locked
         value
       end
 
@@ -306,7 +306,7 @@ module Kward
 
       def exit_input
         clear_finished_input_locked
-        @output_io.flush
+        flush_output_locked
         EXIT_INPUT
       end
 

data/lib/kward/prompt_interface/composer_renderer.rb

@@ -8,7 +8,7 @@ module Kward
 
       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 editor_layout(width, height) if editor_visible?
         return compact_composer_layout(width) if height < 4
         return question_composer_layout(width, height) if @question_state
 
@@ -265,6 +265,33 @@ module Kward
         @composer.cursor_logical_position
       end
 
+      def image_viewer_preview_rows(height, width: screen_width)
+        available_rows = max_project_browser_rows(height, width: width)
+        desired_rows = [(IMAGE_VIEWER_MAX_ROWS * image_viewer_zoom).round, 1].max
+        [available_rows, desired_rows].min
+      end
+
+      def image_viewer_rows(width, height: screen_height)
+        content_width = [width - 4, 1].max
+        preview_rows = image_viewer_preview_rows(height, width: width)
+        title = visible_truncate(" Image: #{@image_viewer_state[:display_path]} ", content_width)
+        rows = [
+          colored("╭", :primary_green) + title + colored("─" * [width - ANSI.strip(title).length - 2, 0].max, :primary_green) + colored("╮", :primary_green),
+          image_viewer_graphic_row(width, image_viewer_sequence(width, height))
+        ]
+        rows.concat(Array.new(preview_rows - 1) { box_content_row("", content_width) })
+        zoom = (image_viewer_zoom * 100).round
+        rows << footer_row(content_width, "Read-only image preview · #{zoom}% · +/- zoom · Esc/Q close")
+        rows << bottom_border(width)
+        rows
+      end
+
+      def image_viewer_graphic_row(width, sequence)
+        left_border = "#{colored("│", :primary_green)} "
+        right_border = "#{TerminalSequences.move_to_column(width)}#{colored("│", :primary_green)}"
+        "#{TTY::Cursor.clear_line}#{left_border}#{sequence}#{right_border}"
+      end
+
     end
   end
 end

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

@@ -83,9 +83,12 @@ module Kward
 
       def editor_insert_tab
         if @editor_state.multi_cursor? || @editor_state.selection_ranges.any?
+          reset_editor_word_completion
           return @editor_state.replace_selections(editor_indent_unit)
         end
 
+        return true if editor_complete_buffer_word
+
         if current_editor_auto_indent? && editor_cursor_in_leading_indent?
           return editor_smart_tab_forward
         end

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

@@ -13,6 +13,10 @@ module Kward
         !@editor_state.nil?
       end
 
+      def editor_visible?
+        editor_active?
+      end
+
       def open_selected_file_in_editor(fallback_to_typed_path: false)
         path = selected_file_open_path
         if path
@@ -58,6 +62,7 @@ module Kward
           language: language
         )
         @editor_state.status = scratchpad_status_text(language)
+        @editor_agent_suspended = false
         @prompt_label = "Edit>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -95,6 +100,7 @@ module Kward
         end
 
         @editor_state = EditorState.new(path: full_path, content: File.exist?(full_path) ? File.read(full_path) : "", new_file: !File.exist?(full_path), editor_mode: current_editor_mode)
+        @editor_agent_suspended = false
         @prompt_label = "Edit>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -115,6 +121,7 @@ module Kward
         diff_view_mode = current_diff_view_mode
         viewer_content = diff_view_mode == DiffViewMode::SIDE_BY_SIDE ? side_by_side_diff_content(content.to_s) : content.to_s
         @editor_state = EditorState.new(path: path.to_s, content: viewer_content, new_file: true, editor_mode: current_editor_mode, readonly: true, diff_view: diff_view_mode)
+        @editor_agent_suspended = false
         @prompt_label = "Diff>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -243,6 +250,7 @@ module Kward
         @editor_save_as_buffer = ""
         @editor_save_callback = nil
         @editor_state = nil
+        @editor_agent_suspended = false
         @prompt_label = "You>"
         self.composer_input = ""
         self.composer_cursor = 0
@@ -252,6 +260,9 @@ module Kward
 
       def handle_editor_key(key)
         return if key.nil?
+        return handle_editor_prompt_key(key) if @editor_prompt_active
+
+        reset_editor_word_completion unless editor_word_completion_tab_key?(key) && !editor_search_active?
         mouse_result = handle_editor_mouse_key(key)
         return mouse_result unless mouse_result == false
         return handle_editor_save_as_key(key) if @editor_save_as_active
@@ -312,6 +323,64 @@ module Kward
         end
       end
 
+      def editor_prompt_action(instruction)
+        {
+          editor_prompt: {
+            instruction: instruction.to_s.strip,
+            display_input: ":prompt #{instruction.to_s.strip}"
+          }
+        }
+      end
+
+      def begin_editor_prompt
+        @editor_prompt_active = true
+        @editor_prompt_input = ""
+        @editor_state.status = "Prompt: "
+        true
+      end
+
+      def handle_editor_prompt_key(key)
+        sequence = parse_csi_u_key(key)
+        if sequence
+          queue_pending_keys(sequence[:remaining]) if sequence[:remaining] && !sequence[:remaining].empty?
+          return handle_editor_prompt_key("\r") if sequence[:code] == 13
+          return handle_editor_prompt_key("\e") if sequence[:code] == 27
+          return handle_editor_prompt_key("\b") if [8, 127].include?(sequence[:code])
+
+          text = csi_u_printable_text(sequence)
+          return handle_editor_prompt_key(text) if text
+
+          return true
+        end
+
+        case key
+        when "\e", TerminalKeys::CTRL_C, :escape
+          @editor_prompt_active = false
+          @editor_prompt_input = ""
+          @editor_state.status = EditorStatusText.default(readonly: @editor_state.readonly?, editor_mode: @editor_state.editor_mode)
+          true
+        when "\b", "\x7F"
+          @editor_prompt_input = @editor_prompt_input[0...-1]
+          @editor_state.status = "Prompt: #{@editor_prompt_input}"
+        when "\n", "\r"
+          instruction = @editor_prompt_input.strip
+          @editor_prompt_active = false
+          @editor_prompt_input = ""
+          if instruction.empty?
+            @editor_state.status = "Prompt instruction required"
+            true
+          else
+            editor_prompt_action(instruction)
+          end
+        else
+          if printable_key?(key)
+            @editor_prompt_input += key
+            @editor_state.status = "Prompt: #{@editor_prompt_input}"
+          end
+          true
+        end
+      end
+
       def handle_editor_csi_u_key(key)
         sequence = parse_csi_u_key(key)
         return false unless sequence
@@ -992,8 +1061,8 @@ module Kward
         return false if text.empty?
 
         @editor_state.push_kill(text)
-        @output_io.print(TerminalSequences.osc52(text))
-        @output_io.flush if @output_io.respond_to?(:flush)
+        print_output_locked(TerminalSequences.osc52(text))
+        flush_output_locked if @output_io.respond_to?(:flush)
         @editor_state.clear_selection
         @editor_state.status = "Copied selection"
         true
@@ -1103,16 +1172,16 @@ module Kward
       def enable_editor_mouse_reporting
         return if @editor_mouse_reporting_enabled
 
-        @output_io.print(TerminalSequences::MOUSE_REPORTING_ENABLE)
-        @output_io.flush if @output_io.respond_to?(:flush)
+        print_output_locked(TerminalSequences::MOUSE_REPORTING_ENABLE)
+        flush_output_locked if @output_io.respond_to?(:flush)
         @editor_mouse_reporting_enabled = true
       end
 
       def disable_editor_mouse_reporting(force: false)
         return unless force || @editor_mouse_reporting_enabled
 
-        @output_io.print(TerminalSequences::MOUSE_REPORTING_DISABLE)
-        @output_io.flush if @output_io.respond_to?(:flush)
+        print_output_locked(TerminalSequences::MOUSE_REPORTING_DISABLE)
+        flush_output_locked if @output_io.respond_to?(:flush)
         @editor_mouse_reporting_enabled = false
       end
 

data/lib/kward/prompt_interface/editor/modes/emacs.rb

@@ -240,8 +240,8 @@ module Kward
         end
 
         @editor_state.copy_for_kill_ring(range[0], range[1])
-        @output_io.print(TerminalSequences.osc52(@editor_state.kill_buffer))
-        @output_io.flush if @output_io.respond_to?(:flush)
+        print_output_locked(TerminalSequences.osc52(@editor_state.kill_buffer))
+        flush_output_locked if @output_io.respond_to?(:flush)
         @editor_state.clear_selection
         @editor_state.status = "Copied region"
         true

data/lib/kward/prompt_interface/editor/modes/modern.rb

@@ -198,6 +198,8 @@ module Kward
 
       def handle_modern_key_binding(key)
         case key
+        when TerminalKeys::CTRL_PERIOD
+          begin_editor_prompt
         when TerminalKeys::CTRL_SPACE
           true
         when TerminalKeys::CTRL_C
@@ -221,6 +223,8 @@ module Kward
         end
 
         case normalized_code
+        when 46
+          begin_editor_prompt
         when 13
           return false if editor_search_active?
 

data/lib/kward/prompt_interface/editor/modes/vibe.rb

@@ -192,6 +192,7 @@ module Kward
       end
 
       def handle_vibe_command_key(key)
+        result = nil
         case key
         when "\e", TerminalKeys::CTRL_C, :escape
           @editor_state.vibe_command = ""
@@ -202,20 +203,21 @@ module Kward
         when "\t"
           vibe_complete_command_path
         when "\n", "\r"
-          execute_vibe_command(@editor_state.vibe_command)
+          result = execute_vibe_command(@editor_state.vibe_command)
         else
           if printable_key?(key)
             @editor_state.vibe_command = @editor_state.vibe_command.to_s + key
             @editor_state.status = ":#{@editor_state.vibe_command}"
           end
         end
-        true
+        result || true
       end
 
       def execute_vibe_command(command)
         command = command.to_s.strip
         @editor_state.vibe_mode = "normal"
         @editor_state.vibe_command = ""
+        action = nil
         case command
         when "w"
           save_editor
@@ -225,6 +227,10 @@ module Kward
           vibe_edit_file(Regexp.last_match(2), force: Regexp.last_match(1) == "!")
         when "run"
           vibe_record_undo { run_editor_buffer }
+        when /\Aprompt\s+(.+)\z/
+          action = editor_prompt_action(Regexp.last_match(1))
+        when "prompt"
+          @editor_state.status = "Prompt instruction required"
         when "q"
           vibe_quit_editor
         when "q!"
@@ -244,7 +250,7 @@ module Kward
         else
           @editor_state.status = "Unknown command: #{command}"
         end
-        true
+        action || true
       end
 
       def vibe_edit_file(path, force: false)
@@ -426,7 +432,7 @@ module Kward
       def vibe_return_to_normal
         vibe_apply_visual_block_insert if @editor_state.vibe_visual_block_insert
         @editor_state.vibe_mode = "normal"
-        @editor_state.status = "NORMAL · i insert · :w save · :q quit"
+        @editor_state.status = "NORMAL · i insert · :prompt ask agent · :w save · :q quit"
         true
       end
 
@@ -2239,8 +2245,8 @@ module Kward
       def vibe_copy_range(start_index, end_index, status, linewise: false)
         @editor_state.copy_range(start_index, end_index)
         @editor_state.vibe_kill_linewise = linewise
-        @output_io.print(TerminalSequences.osc52(@editor_state.kill_buffer))
-        @output_io.flush if @output_io.respond_to?(:flush)
+        print_output_locked(TerminalSequences.osc52(@editor_state.kill_buffer))
+        flush_output_locked if @output_io.respond_to?(:flush)
         @editor_state.status = status
       end
 

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

@@ -264,6 +264,7 @@ module Kward
 
       def editor_status_text
         text = @editor_state.search_active ? "#{@editor_state.search_direction == :backward ? "Search backward" : "Search"}: #{@editor_state.search_query}" : @editor_state.status
+        text = "#{text} · #{spinner_frame}" if @editor_agent_suspended && @busy
         visible_truncate(text, [screen_width - 4, 1].max)
       end
     end

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

@@ -830,6 +830,17 @@ module Kward
         @cursor = @buffer.length
       end
 
+      def replace_buffer(content)
+        content = content.to_s
+        return false if content == @buffer
+
+        push_undo
+        self.buffer = content
+        @cursor = [@cursor, @buffer.length].min
+        changed!
+        true
+      end
+
       def replace_range(start_index, end_index, text)
         start_index, = @text_buffer.replace_range(start_index, end_index, text)
         @buffer = @text_buffer.text

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

@@ -0,0 +1,124 @@
+# Namespace for the Kward CLI agent runtime.
+module Kward
+  # Interactive terminal UI used by the CLI frontend.
+  class PromptInterface
+    # Current-buffer word completion for the built-in composer file editor.
+    module EditorWordCompletion
+      EDITOR_COMPLETION_WORD_PATTERN = /[[:alnum:]_]+/.freeze
+      EDITOR_COMPLETION_PREFIX_PATTERN = /[[:alnum:]_]+\z/.freeze
+      EDITOR_COMPLETION_SUFFIX_PATTERN = /\A[[:alnum:]_]*/.freeze
+
+      private
+
+      def editor_complete_buffer_word
+        if (cycle = matching_editor_completion_cycle)
+          return cycle_editor_word_completion(cycle) if cycle[:candidates].length > 1
+
+          reset_editor_word_completion
+        end
+
+        context = editor_word_completion_context
+        return false unless context
+
+        candidates = editor_word_completion_candidates(context)
+        return false if candidates.empty?
+
+        @editor_word_completion = context.merge(
+          editor_state: @editor_state,
+          candidates: candidates,
+          index: 0,
+          previous_status: @editor_state.status
+        )
+        apply_editor_word_completion(@editor_word_completion)
+        true
+      end
+
+      def editor_word_completion_context
+        buffer = @editor_state.buffer
+        cursor = @editor_state.cursor
+        prefix_match = buffer[0...cursor].to_s.match(EDITOR_COMPLETION_PREFIX_PATTERN)
+        return nil unless prefix_match
+
+        suffix = buffer[cursor..].to_s.match(EDITOR_COMPLETION_SUFFIX_PATTERN).to_s
+        {
+          prefix: prefix_match[0],
+          range_start: prefix_match.begin(0),
+          range_end: cursor + suffix.length
+        }
+      end
+
+      def editor_word_completion_candidates(context)
+        matches = []
+        @editor_state.buffer.to_enum(:scan, EDITOR_COMPLETION_WORD_PATTERN).each do
+          match = Regexp.last_match
+          next if editor_completion_match_overlaps_context?(match, context)
+
+          word = match[0]
+          next unless word.length > context[:prefix].length
+          next unless word.start_with?(context[:prefix])
+
+          matches << [word, match.begin(0)]
+        end
+
+        matches
+          .sort_by { |_word, offset| editor_completion_candidate_order(offset, context) }
+          .map(&:first)
+          .uniq
+      end
+
+      def editor_completion_match_overlaps_context?(match, context)
+        match.begin(0) < context[:range_end] && match.end(0) > context[:range_start]
+      end
+
+      def editor_completion_candidate_order(offset, context)
+        if offset < context[:range_start]
+          [0, context[:range_start] - offset]
+        else
+          [1, offset - context[:range_end]]
+        end
+      end
+
+      def matching_editor_completion_cycle
+        cycle = @editor_word_completion
+        return nil unless cycle
+
+        same_editor = cycle[:editor_state].equal?(@editor_state)
+        same_buffer = cycle[:buffer] == @editor_state.buffer
+        same_cursor = cycle[:cursor] == @editor_state.cursor
+        return cycle if same_editor && same_buffer && same_cursor
+
+        reset_editor_word_completion
+        nil
+      end
+
+      def cycle_editor_word_completion(cycle)
+        cycle[:index] = (cycle[:index] + 1) % cycle[:candidates].length
+        apply_editor_word_completion(cycle)
+        true
+      end
+
+      def apply_editor_word_completion(cycle)
+        candidate = cycle[:candidates][cycle[:index]]
+        @editor_state.replace_range(cycle[:range_start], cycle[:range_end], candidate)
+        @editor_state.cursor = cycle[:range_start] + candidate.length
+        cycle[:range_end] = @editor_state.cursor
+        cycle[:buffer] = @editor_state.buffer
+        cycle[:cursor] = @editor_state.cursor
+        cycle[:status] = "Completion #{cycle[:index] + 1}/#{cycle[:candidates].length}: #{candidate}"
+        @editor_state.status = cycle[:status]
+      end
+
+      def reset_editor_word_completion
+        cycle = @editor_word_completion
+        if cycle && cycle[:editor_state].status == cycle[:status]
+          cycle[:editor_state].status = cycle[:previous_status]
+        end
+        @editor_word_completion = nil
+      end
+
+      def editor_word_completion_tab_key?(key)
+        !editor_tab_sequence_for(key).nil?
+      end
+    end
+  end
+end

data/lib/kward/prompt_interface/file_overlay.rb

@@ -114,8 +114,12 @@ module Kward
         end
       end
 
-      def project_file_paths
-        @file_mention_paths ||= discover_project_file_paths
+      def project_file_paths(include_ignored: false)
+        if include_ignored
+          @project_browser_file_paths ||= discover_project_file_paths(include_ignored: true)
+        else
+          @file_mention_paths ||= discover_project_file_paths
+        end
       end
 
       def project_file_path_entries
@@ -126,14 +130,24 @@ module Kward
         @file_mention_path_entries = paths.map { |path| { path: path, downcase: path.downcase } }
       end
 
-      def discover_project_file_paths
-        paths = git_project_file_paths
-        paths = scanned_project_file_paths if paths.empty?
+      def discover_project_file_paths(include_ignored: false)
+        paths = if include_ignored
+                  git_project_file_paths(include_ignored: true)
+                else
+                  git_project_file_paths
+                end
+        paths = scanned_project_file_paths if paths.empty? && !git_project_repository?
         paths.reject { |path| path.empty? || path.end_with?("/") }.uniq.sort
       end
 
-      def git_project_file_paths
-        ProjectFiles.git_paths(prompt_workspace_root)
+      def git_project_file_paths(include_ignored: false)
+        return ProjectFiles.git_paths(prompt_workspace_root) unless include_ignored
+
+        ProjectFiles.git_paths(prompt_workspace_root, include_ignored: true)
+      end
+
+      def git_project_repository?
+        ProjectFiles.git_repository?(prompt_workspace_root)
       end
 
       def scanned_project_file_paths

data/lib/kward/prompt_interface/git_prompt.rb

@@ -262,7 +262,7 @@ module Kward
           self.composer_cursor = 0
           @asking = true
           render_prompt_locked
-          @output_io.flush
+          flush_output_locked
         end
       end
 

data/lib/kward/prompt_interface/key_handler.rb

@@ -20,6 +20,14 @@ module Kward
       end
 
       def handle_editor_input_key(key)
+        if @editor_agent_suspended
+          return CANCEL_INPUT if @busy && key == TerminalKeys::CTRL_C
+
+          return true
+        end
+
+        reset_editor_word_completion unless editor_word_completion_tab_key?(key)
+
         tab_result = handle_tab_key_binding(key)
         return tab_result unless tab_result == false
 
@@ -27,9 +35,31 @@ 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?

data/lib/kward/prompt_interface/overlay_renderer.rb

@@ -10,6 +10,7 @@ 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?