kward 0.78.0 → 0.80.0

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

@@ -47,20 +47,22 @@ module Kward
       end
 
       def line_and_column_for(offset)
-        before_cursor = before(offset)
-        [before_cursor.count("\n"), (before_cursor.split("\n", -1).last || "").length]
+        offset = [[offset.to_i, 0].max, @text.length].min
+        next_line = line_start_offsets.bsearch_index { |line_offset| line_offset > offset }
+        line_index = next_line ? [next_line - 1, 0].max : lines.length - 1
+        [line_index, [offset - line_start_offsets[line_index], lines[line_index].length].min]
       end
 
       def offset_for_line_and_column(line_index, column)
         values = lines
         line_index = [[line_index.to_i, 0].max, values.length - 1].min
         column = [[column.to_i, 0].max, values[line_index].length].min
-        values.first(line_index).sum { |line| line.length + 1 } + column
+        line_start_offsets[line_index] + column
       end
 
       def line_start_offset(line_index)
         line_index = [[line_index.to_i, 0].max, lines.length - 1].min
-        lines.first(line_index).sum { |line| line.length + 1 }
+        line_start_offsets[line_index]
       end
 
       def line_range(line_index)
@@ -101,8 +103,20 @@ module Kward
 
       private
 
+      def line_start_offsets
+        @line_start_offsets ||= begin
+          values = lines
+          offsets = [0]
+          (values.length - 1).times do |index|
+            offsets << offsets.last + values[index].length + 1
+          end
+          offsets
+        end
+      end
+
       def invalidate_lines_cache
         @lines_cache = nil
+        @line_start_offsets = nil
       end
     end
   end

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

@@ -39,8 +39,8 @@ module Kward
       end
 
       def history_file_open_command(path)
-        full_path = File.expand_path(path.to_s, Dir.pwd)
-        relative_path = Pathname.new(full_path).relative_path_from(Pathname.new(File.expand_path(Dir.pwd))).to_s
+        full_path = File.expand_path(path.to_s, prompt_workspace_root)
+        relative_path = Pathname.new(full_path).relative_path_from(Pathname.new(prompt_workspace_root)).to_s
         "$#{relative_path}"
       rescue ArgumentError
         "$#{path}"
@@ -71,9 +71,9 @@ module Kward
         true
       end
 
-      def open_editor(path, allow_new: false, base_dir: Dir.pwd, restrict_to_workspace: true)
-        full_path = File.expand_path(path.to_s, base_dir)
-        root = File.expand_path(Dir.pwd)
+      def open_editor(path, allow_new: false, base_dir: nil, restrict_to_workspace: true)
+        full_path = File.expand_path(path.to_s, base_dir || prompt_workspace_root)
+        root = prompt_workspace_root
         if restrict_to_workspace && !(full_path == root || full_path.start_with?("#{root}/"))
           @file_editor_open_status = "Cannot edit file outside workspace"
           return false
@@ -153,11 +153,11 @@ module Kward
             pending_deletions << line[1..].to_s
           elsif line.start_with?("+")
             deleted = pending_deletions.shift
-            rows << side_by_side_diff_row(deleted && "- #{deleted}", "+ #{line[1..]}", width)
+            rows.concat(side_by_side_diff_rows(deleted && "- #{deleted}", "+ #{line[1..]}", width))
           else
             rows.concat(flush_side_by_side_deletions(pending_deletions, width))
             text = line.start_with?(" ") ? line[1..].to_s : line
-            rows << side_by_side_diff_row("  #{text}", "  #{text}", width)
+            rows.concat(side_by_side_diff_rows("  #{text}", "  #{text}", width))
           end
         end
 
@@ -170,7 +170,17 @@ module Kward
       end
 
       def flush_side_by_side_deletions(lines, width)
-        lines.shift(lines.length).map { |line| side_by_side_diff_row("- #{line}", nil, width) }
+        lines.shift(lines.length).flat_map { |line| side_by_side_diff_rows("- #{line}", nil, width) }
+      end
+
+      def side_by_side_diff_rows(left, right, width)
+        return [side_by_side_diff_row(left, right, width)] unless current_editor_soft_wrap?
+
+        left_lines = side_by_side_diff_cell_lines(left, width)
+        right_lines = side_by_side_diff_cell_lines(right, width)
+        [left_lines.length, right_lines.length].max.times.map do |index|
+          side_by_side_diff_row(left_lines[index], right_lines[index], width)
+        end
       end
 
       def side_by_side_diff_row(left, right, width)
@@ -184,6 +194,17 @@ module Kward
         visible_truncate(value, width)
       end
 
+      def side_by_side_diff_cell_lines(text, width)
+        return [""] if text.nil?
+
+        value = text.to_s
+        prefix = value.start_with?("- ", "+ ", "  ") ? value[0, 2] : ""
+        content = value.delete_prefix(prefix)
+        return [prefix] if content.empty?
+
+        content.chars.each_slice([width - prefix.length, 1].max).map { |characters| "#{prefix}#{characters.join}" }
+      end
+
       def side_by_side_diff_column_width
         content_width = [screen_width - 4, 1].max
         gutter_width = [[999.to_s.length, 4].max + 3, 1].max
@@ -220,6 +241,7 @@ module Kward
         @editor_text_width = nil
         @editor_save_as_active = false
         @editor_save_as_buffer = ""
+        @editor_save_callback = nil
         @editor_state = nil
         @prompt_label = "You>"
         self.composer_input = ""
@@ -1150,6 +1172,17 @@ module Kward
           return true
         end
 
+        if @editor_save_callback
+          result = @editor_save_callback.call(@editor_state.buffer)
+          if result.to_s.empty?
+            close_editor
+            return true
+          end
+
+          @editor_state.status = result.to_s
+          return false
+        end
+
         if path.to_s.strip.empty? && @editor_state.path.to_s.empty?
           if prompt_for_path
             begin_editor_save_as
@@ -1268,8 +1301,8 @@ module Kward
       end
 
       def bind_editor_save_path(path)
-        full_path = File.expand_path(path.to_s.strip, Dir.pwd)
-        root = File.expand_path(Dir.pwd)
+        full_path = File.expand_path(path.to_s.strip, prompt_workspace_root)
+        root = prompt_workspace_root
         unless full_path == root || full_path.start_with?("#{root}/")
           @editor_state.status = "Cannot save outside workspace"
           return false

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

@@ -280,8 +280,8 @@ module Kward
 
       def vibe_path_completion_candidates(prefix)
         directory_prefix, basename_prefix = vibe_split_path_completion_prefix(prefix)
-        search_directory = File.expand_path(directory_prefix.empty? ? "." : directory_prefix, Dir.pwd)
-        root = File.expand_path(Dir.pwd)
+        search_directory = File.expand_path(directory_prefix.empty? ? "." : directory_prefix, prompt_workspace_root)
+        root = prompt_workspace_root
         return [] unless search_directory == root || search_directory.start_with?("#{root}/")
         return [] unless File.directory?(search_directory)
 

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

@@ -34,7 +34,7 @@ module Kward
         rows = [editor_top_border(width)]
         rows.concat(visible_lines.each_with_index.map do |line, index|
           gutter = if index < actual_visible_count
-                     editor_line_number_gutter(@editor_state.viewport_row + index)
+                     editor_line_number_gutter(@editor_state.viewport_row + index, line_index)
                    else
                      editor_blank_line_number_gutter
                    end
@@ -59,7 +59,7 @@ module Kward
         rows = [editor_top_border(width)]
         rows.concat(visible_rows.map do |visual_row|
           if visual_row
-            gutter = visual_row[:continuation] ? editor_blank_line_number_gutter : editor_line_number_gutter(visual_row[:line_index])
+            gutter = visual_row[:continuation] ? editor_blank_line_number_gutter : editor_line_number_gutter(visual_row[:line_index], line_index)
             rendered_line = editor_render_line(visual_row[:line], visual_row[:line_index], text_width, column_offset: visual_row[:column_offset])
             box_content_row(gutter + rendered_line, content_width)
           else
@@ -230,16 +230,16 @@ module Kward
         (column.to_i / text_width) * text_width
       end
 
-      def editor_line_number_gutter(line_index)
-        number = editor_display_line_number(line_index).to_s.rjust(editor_line_number_gutter_width - 3)
-        colored("#{number} │ ", :dark_forest_green)
+      def editor_line_number_gutter(line_index, cursor_line)
+        number = editor_display_line_number(line_index, cursor_line).to_s.rjust(editor_line_number_gutter_width - 3)
+        number_color = line_index == cursor_line ? :white : :dark_forest_green
+        colored(number, number_color) + colored(" │ ", :dark_forest_green)
       end
 
-      def editor_display_line_number(line_index)
+      def editor_display_line_number(line_index, cursor_line)
         return line_index + 1 unless current_editor_line_numbers == "relative"
         return line_index + 1 if @editor_state.readonly?
 
-        cursor_line, = @editor_state.cursor_line_and_column
         line_index == cursor_line ? line_index + 1 : (line_index - cursor_line).abs
       end
 
@@ -257,7 +257,7 @@ module Kward
 
       def editor_display_path
         path = @editor_state.path || @editor_state.display_path
-        Pathname.new(path).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        Pathname.new(path).relative_path_from(Pathname.new(prompt_workspace_root)).to_s
       rescue StandardError
         @editor_state.display_path || @editor_state.path
       end

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

@@ -793,21 +793,15 @@ module Kward
       end
 
       def cursor_line_and_column_for(offset)
-        before_cursor = @buffer[0...offset].to_s
-        [before_cursor.count("\n"), (before_cursor.split("\n", -1).last || "").length]
+        @text_buffer.line_and_column_for(offset)
       end
 
       def line_start_offset(line_index)
-        values = lines
-        line_index = [[line_index.to_i, 0].max, values.length - 1].min
-        values.first(line_index).sum { |line| line.length + 1 }
+        @text_buffer.line_start_offset(line_index)
       end
 
       def line_range(line_index)
-        start_index = line_start_offset(line_index)
-        end_index = start_index + lines[line_index].to_s.length
-        end_index += 1 if end_index < @buffer.length
-        [start_index, end_index]
+        @text_buffer.line_range(line_index)
       end
 
       def word_range_at(offset)

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

@@ -11,12 +11,14 @@ module Kward
       ].freeze
       RUBY_PATTERN = /("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|:[a-zA-Z_]\w*[!?=]?|\b\d+(?:\.\d+)?\b|\b[A-Z]\w*\b|\b(?:#{Regexp.union(RUBY_KEYWORDS)})\b)/.freeze
       MARKDOWN_PATTERN = /(`[^`\n]+`|!?\[[^\]\n]+\]\([^\)\n]+\)|(?:\*\*|__)[^\n]+?(?:\*\*|__)|(?:\*|_)[^\n]+?(?:\*|_))/.freeze
-      HTML_PATTERN = /(<!--.*?-->|<\/?[A-Za-z][^>]*>|\b[A-Za-z_:-]+(?=\=)|"[^"]*"|'[^']*')/.freeze
+      HTML_TAG_START_PATTERN = /<\/?[A-Za-z][\w:-]*/.freeze
       CSS_PATTERN = /("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|#[0-9a-fA-F]{3,8}\b|\.[A-Za-z_-][\w-]*|#[A-Za-z_-][\w-]*|\b\d+(?:\.\d+)?(?:px|em|rem|%|vh|vw|s|ms)?\b|[A-Za-z_-][\w-]*(?=\s*:)|@[A-Za-z_-][\w-]*)/.freeze
       JSON_PATTERN = /("(?:\\.|[^"\\])*"(?=\s*:)|"(?:\\.|[^"\\])*"|\b(?:true|false|null)\b|-?\b\d+(?:\.\d+)?(?:[eE][+-]?\d+)?\b)/.freeze
       YAML_PATTERN = /("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\b(?:true|false|null|yes|no|on|off)\b|\b\d+(?:\.\d+)?\b|[A-Za-z0-9_-]+(?=\s*:))/.freeze
       SQL_PATTERN = /("(?:\\.|[^"\\])*"|'(?:''|[^'])*'|--.*|\b\d+(?:\.\d+)?\b|\b(?:SELECT|FROM|WHERE|JOIN|LEFT|RIGHT|INNER|OUTER|ON|INSERT|INTO|UPDATE|DELETE|CREATE|ALTER|DROP|TABLE|VIEW|INDEX|VALUES|SET|AND|OR|NOT|NULL|IS|AS|ORDER|BY|GROUP|HAVING|LIMIT|OFFSET|DISTINCT|UNION|ALL|CASE|WHEN|THEN|ELSE|END|PRIMARY|KEY|FOREIGN|REFERENCES|DEFAULT|TRUE|FALSE)\b)/i.freeze
       GENERIC_STRING_NUMBER_PATTERN = /("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`|\b\d+(?:\.\d+)?\b)/.freeze
+      ERB_OPEN_PATTERN = /<%[#=]?/.freeze
+      ERB_CLOSE_PATTERN = /-?%>/.freeze
 
       LANGUAGE_DEFINITIONS = {
         javascript: {
@@ -103,6 +105,7 @@ module Kward
       JSON_EXTENSIONS = %w[.json].freeze
       YAML_EXTENSIONS = %w[.yml .yaml].freeze
       HTML_EXTENSIONS = %w[.html .htm].freeze
+      ERB_EXTENSIONS = %w[.erb].freeze
       CSS_EXTENSIONS = %w[.css].freeze
       SCSS_EXTENSIONS = %w[.scss].freeze
       SQL_EXTENSIONS = %w[.sql].freeze
@@ -123,6 +126,8 @@ module Kward
           editor_highlight_yaml(line)
         when :html
           editor_highlight_html(line)
+        when :erb
+          editor_highlight_erb(line, line_index)
         when :css, :scss
           editor_highlight_css(line)
         when :sql
@@ -153,6 +158,7 @@ module Kward
         return :json if JSON_EXTENSIONS.include?(extension)
         return :yaml if YAML_EXTENSIONS.include?(extension)
         return :html if HTML_EXTENSIONS.include?(extension)
+        return :erb if ERB_EXTENSIONS.include?(extension)
         return :scss if SCSS_EXTENSIONS.include?(extension)
         return :css if CSS_EXTENSIONS.include?(extension)
         return :sql if SQL_EXTENSIONS.include?(extension)
@@ -174,6 +180,80 @@ module Kward
         editor_highlight_ruby_code(text[0...comment_index].to_s) + colored(text[comment_index..].to_s, :gray)
       end
 
+      def editor_highlight_erb(line, line_index = nil)
+        segments, = editor_erb_segments(line.to_s, editor_erb_state_before_line(line_index))
+        output = +""
+        comment = +""
+        html_in_tag = false
+
+        segments.each do |kind, text|
+          if kind == :comment
+            comment << text
+            next
+          end
+
+          unless comment.empty?
+            output << colored(comment, :gray)
+            comment.clear
+          end
+          case kind
+          when :template
+            highlighted, html_in_tag = editor_highlight_html_segment(text, in_tag: html_in_tag)
+            output << highlighted
+          when :ruby
+            output << editor_highlight_ruby(text)
+          when :delimiter
+            output << colored(text, :cyan)
+          end
+        end
+        output << colored(comment, :gray) unless comment.empty?
+        output
+      end
+
+      def editor_erb_state_before_line(line_index)
+        return :template unless line_index && @editor_state
+
+        state = :template
+        @editor_state.lines.first(line_index.to_i).each do |line|
+          _, state = editor_erb_segments(line.to_s, state)
+        end
+        state
+      end
+
+      def editor_erb_segments(text, state)
+        segments = []
+        cursor = 0
+
+        while cursor < text.length
+          if state == :template
+            opening = text.match(ERB_OPEN_PATTERN, cursor)
+            if opening
+              segments << [:template, text[cursor...opening.begin(0)].to_s] unless opening.begin(0) == cursor
+              opening_kind = opening[0] == "<%#" ? :comment : :delimiter
+              segments << [opening_kind, opening[0]]
+              state = opening_kind == :comment ? :comment : :ruby
+              cursor = opening.end(0)
+            else
+              segments << [:template, text[cursor..].to_s]
+              break
+            end
+          else
+            closing = text.match(ERB_CLOSE_PATTERN, cursor)
+            if closing
+              segments << [state, text[cursor...closing.begin(0)].to_s] unless closing.begin(0) == cursor
+              segments << [state == :comment ? :comment : :delimiter, closing[0]]
+              state = :template
+              cursor = closing.end(0)
+            else
+              segments << [state, text[cursor..].to_s]
+              break
+            end
+          end
+        end
+
+        [segments, state]
+      end
+
       def editor_highlight_ruby_code(line)
         line.to_s.gsub(RUBY_PATTERN) do |token|
           editor_highlight_ruby_token(token)
@@ -372,17 +452,112 @@ module Kward
       end
 
       def editor_highlight_html(line)
-        line.to_s.gsub(HTML_PATTERN) do |token|
-          if token.start_with?("<!--")
-            colored(token, :gray)
-          elsif token.start_with?("<")
-            colored(token, :blue)
-          elsif token.start_with?("\"", "'")
-            colored(token, :green)
+        highlighted, = editor_highlight_html_segment(line.to_s)
+        highlighted
+      end
+
+      def editor_highlight_html_segment(text, in_tag: false)
+        output = +""
+        cursor = 0
+
+        while cursor < text.length
+          if in_tag
+            close_index = text.index(">", cursor)
+            if close_index
+              output << editor_highlight_html_tag_fragment(text[cursor..close_index].to_s)
+              cursor = close_index + 1
+              in_tag = false
+            else
+              output << editor_highlight_html_tag_fragment(text[cursor..].to_s)
+              break
+            end
+            next
+          end
+
+          comment_index = text.index("<!--", cursor)
+          tag = text.match(HTML_TAG_START_PATTERN, cursor)
+          next_match = [comment_index, tag&.begin(0)].compact.min
+          unless next_match
+            output << text[cursor..].to_s
+            break
+          end
+
+          output << text[cursor...next_match].to_s if next_match > cursor
+          if comment_index == next_match
+            close_index = text.index("-->", comment_index + 4)
+            end_index = close_index ? close_index + 3 : text.length
+            output << colored(text[comment_index...end_index].to_s, :gray)
+            cursor = end_index
           else
-            colored(token, :cyan)
+            close_index = text.index(">", tag.end(0))
+            end_index = close_index ? close_index + 1 : text.length
+            output << editor_highlight_html_tag_fragment(text[tag.begin(0)...end_index].to_s)
+            cursor = end_index
+            in_tag = close_index.nil?
           end
         end
+
+        [output, in_tag]
+      end
+
+      def editor_highlight_html_tag_fragment(tag)
+        output = +""
+        cursor = 0
+        head = tag.match(/\A<\/?[A-Za-z][\w:-]*/)
+        if head
+          output << colored(head[0], :blue)
+          cursor = head.end(0)
+        end
+
+        while cursor < tag.length
+          rest = tag[cursor..].to_s
+          if rest.start_with?(">", "/>")
+            output << colored(rest.start_with?("/>") ? "/>" : ">", :blue)
+            cursor += rest.start_with?("/>") ? 2 : 1
+          elsif rest.match?(/\A\s/)
+            whitespace = rest[/\A\s+/]
+            output << whitespace
+            cursor += whitespace.length
+          elsif rest.start_with?("\"", "'")
+            quote = rest[0]
+            close_index = rest.index(quote, 1)
+            if close_index
+              end_index = close_index + 1
+              output << colored(rest[0...end_index], :green)
+              cursor += end_index
+            elsif rest.end_with?(">") && rest.length > 1
+              output << colored(rest[0...-1], :green)
+              output << colored(">", :blue)
+              cursor += rest.length
+            else
+              output << colored(rest, :green)
+              cursor += rest.length
+            end
+          elsif (attribute = rest.match(/\A([A-Za-z_:][\w:.-]*)(\s*=\s*)/))
+            output << colored(attribute[1], :cyan)
+            output << attribute[2]
+            cursor += attribute[0].length
+            value = tag[cursor..].to_s
+            if value.start_with?("\"", "'")
+              quote = value[0]
+              close_index = value.index(quote, 1)
+              end_index = close_index ? close_index + 1 : value.length
+              output << colored(value[0...end_index], :green)
+              cursor += end_index
+            elsif (unquoted = value.match(/\A[^\s>]+/))
+              output << colored(unquoted[0], :green)
+              cursor += unquoted[0].length
+            end
+          elsif (attribute = rest.match(/\A[A-Za-z_:][\w:.-]*/))
+            output << colored(attribute[0], :cyan)
+            cursor += attribute[0].length
+          else
+            output << rest[0]
+            cursor += 1
+          end
+        end
+
+        output
       end
 
       def editor_highlight_css(line)

data/lib/kward/prompt_interface/file_overlay.rb

@@ -133,11 +133,11 @@ module Kward
       end
 
       def git_project_file_paths
-        ProjectFiles.git_paths(Dir.pwd)
+        ProjectFiles.git_paths(prompt_workspace_root)
       end
 
       def scanned_project_file_paths
-        ProjectFiles.scanned_paths(Dir.pwd)
+        ProjectFiles.scanned_paths(prompt_workspace_root)
       end
 
       def selected_file_mention_path

data/lib/kward/prompt_interface/git_prompt.rb

@@ -84,6 +84,8 @@ module Kward
         binding_result = handle_composer_key_binding(key) if git_composing?
         return binding_result unless binding_result == false || binding_result.nil?
 
+        return git_move_selection(1) if key == "j" && !git_composing?
+        return git_move_selection(-1) if key == "k" && !git_composing?
         return git_toggle_selected_file if key == "s" && !git_composing?
 
         insert_key(key) if git_composing?
@@ -111,8 +113,10 @@ module Kward
           delete_at_cursor if git_composing?
           nil
         else
-          if !git_composing? && code == "s".ord && (sequence[:modifiers].to_s.empty? || sequence[:modifiers].to_s == "1")
-            return git_toggle_selected_file
+          unless git_composing?
+            return git_move_selection(1) if code == "j".ord
+            return git_move_selection(-1) if code == "k".ord
+            return git_toggle_selected_file if code == "s".ord && (sequence[:modifiers].to_s.empty? || sequence[:modifiers].to_s == "1")
           end
           return false unless git_composing?
 
@@ -265,7 +269,7 @@ module Kward
       def git_overlay_rows(width, height: screen_height)
         return [] unless @git_state
 
-        help = git_composing? ? "Type commit message · Enter commit · Tab overlay · Esc cancel" : "↑/↓ select · Enter diff · s stage/unstage · Tab message · Esc cancel"
+        help = git_composing? ? "Type commit message · Enter commit · Tab overlay · Esc cancel" : "↑/↓/j/k select · Enter diff · s stage/unstage · Tab message · Esc cancel"
         lines = [overlay_text_line(help, :muted), overlay_blank_line]
         status_lines = @git_state[:status_lines]
         status_lines = ["No uncommitted changes."] if status_lines.empty?

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

@@ -45,7 +45,8 @@ module Kward
         @on_tick = block
       end
 
-      # Places a character at the given canvas position with optional color.
+      # Stages a character at the given canvas position with optional color.
+      # Call {#render} after completing the frame to publish it.
       #
       # @param row [Integer] zero-based row
       # @param col [Integer] zero-based column
@@ -59,15 +60,14 @@ module Kward
         return if col.negative? || col >= @width
 
         @cells[row][col] = { char: char.to_s[0] || " ", colors: colors.flatten }
-        @dirty = true
       end
 
-      # Clears all canvas cells to blank.
+      # Stages a reset of all canvas cells to blank. Call {#render} after
+      # completing the frame to publish it.
       #
       # @return [void]
       def clear_frame
         @cells = Array.new(@height) { Array.new(@width) { blank_cell } }
-        @dirty = true
       end
 
       # Marks the canvas as ready for Kward to render. Called after the plugin

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

@@ -55,6 +55,9 @@ module Kward
         controller = @interactive_state[:controller]
         return false if controller.exited?
 
+        return true if controller.dirty?
+        return false unless controller.tickable?
+
         now = monotonic_now
         interval = 1.0 / controller.fps
         elapsed = now - @last_interactive_tick
@@ -64,7 +67,7 @@ module Kward
         @last_interactive_tick += steps * interval
         result = controller.invoke_tick
         controller.exit if result == :exit
-        true
+        controller.dirty?
       end
     end
   end

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

@@ -7,8 +7,8 @@ module Kward
     module InteractiveState
       private
 
-      def interactive_canvas_width
-        [screen_width - 6, 1].max
+      def interactive_canvas_width(width = screen_width)
+        [width - 6, 1].max
       end
 
       def route_interactive_key(key)

data/lib/kward/prompt_interface/project_browser.rb

@@ -125,6 +125,14 @@ module Kward
             insert_selected_project_browser_mention
           elsif text == "/" && !project_browser_search_active?
             activate_project_browser_search
+          elsif text == "j" && !project_browser_search_active?
+            select_next_project_browser_row
+          elsif text == "k" && !project_browser_search_active?
+            select_previous_project_browser_row
+          elsif text == "h" && !project_browser_search_active?
+            collapse_selected_project_browser_row
+          elsif text == "l" && !project_browser_search_active?
+            expand_selected_project_browser_row
           elsif project_browser_search_active?
             project_browser_append_search(text)
           else
@@ -148,6 +156,14 @@ module Kward
           toggle_project_browser_search
         when "/"
           activate_project_browser_search
+        when "j"
+          project_browser_search_active? ? project_browser_append_search(key) : select_next_project_browser_row
+        when "k"
+          project_browser_search_active? ? project_browser_append_search(key) : select_previous_project_browser_row
+        when "h"
+          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
         else
           project_browser_append_search(key) if project_browser_search_active? && printable_key?(key)
         end
@@ -319,7 +335,7 @@ module Kward
         if rows.empty?
           lines << overlay_text_line(project_browser_empty_message, :muted)
         else
-          visible = visible_project_browser_rows(rows, height: height)
+          visible = visible_project_browser_rows(rows, height: height, width: width)
           visible[:rows].each_with_index do |row, offset|
             index = visible[:start] + offset
             lines << overlay_choice_line(project_browser_row_text(row), selected: index == @project_browser_state[:selection_index])
@@ -476,7 +492,7 @@ module Kward
       end
 
       def project_browser_workspace_root
-        ConfigFiles.canonical_workspace_root(Dir.pwd)
+        ConfigFiles.canonical_workspace_root(prompt_workspace_root)
       end
 
       def restored_project_browser_expanded_paths(paths, saved_state)
@@ -536,14 +552,17 @@ module Kward
         @project_browser_state[:selection_index] = [[@project_browser_state[:selection_index], 0].max, rows.length - 1].min unless rows.empty?
       end
 
-      def visible_project_browser_rows(rows, height: screen_height)
-        max_rows = max_project_browser_rows(height)
+      def visible_project_browser_rows(rows, height: screen_height, width: screen_width)
+        max_rows = max_project_browser_rows(height, width: width)
         start = centered_list_window_start(@project_browser_state[:selection_index], rows.length, max_rows)
         { start: start, rows: rows[start, max_rows] || [] }
       end
 
-      def max_project_browser_rows(height)
-        [[height - 8, 4].max, 20].min
+      def max_project_browser_rows(height, width: screen_width)
+        composer_bottom_rows = @tabs.empty? ? 1 : tab_border_rows(width).length
+        footer_rows = footer_text.empty? ? 0 : 1
+        attachment_rows = attachment_badge_texts.length
+        [height - 7 - composer_bottom_rows - footer_rows - attachment_rows, 4].max
       end
 
       def default_project_browser_expanded_paths(paths)