fix: cursor positioning in centered dialogs, version 1.7.1

- Fix cursor offset in rename/delete dialogs by using (width - 1)
- Mark red background wins over selection in delete mode
- Add echo for rename cd path
- Hook all tests to rake test (unit + spec)
- Update tests for new highlight color and dialog design

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: tobi

.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "Bash(gh issue list:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

.gitignore

@@ -0,0 +1 @@
+*.callgrind*

Gemfile

@@ -4,5 +4,6 @@ source "https://rubygems.org"
 
 # gem "rails"
 
+gem "rake", group: :development
 gem "ruby-prof", "~> 1.7", group: :development
 gem "minitest", "~> 5.0", group: :development

Gemfile.lock

@@ -0,0 +1,20 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    base64 (0.3.0)
+    minitest (5.27.0)
+    rake (13.3.1)
+    ruby-prof (1.7.2)
+      base64
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  minitest (~> 5.0)
+  rake
+  ruby-prof (~> 1.7)
+
+BUNDLED WITH
+   2.6.2

Rakefile

@@ -1,6 +1,16 @@
-desc "Run spec compliance tests"
-task :test do
+require 'rake/testtask'
+
+Rake::TestTask.new(:unit) do |t|
+  t.libs << 'lib' << 'test'
+  t.pattern = 'test/**/*_test.rb'
+end
+
+desc "Run shell spec compliance tests"
+task :spec do
   sh "bash spec/tests/runner.sh ./try.rb"
 end
 
+desc "Run all tests (unit + spec)"
+task test: [:unit, :spec]
+
 task default: :test

lib/tui.rb

@@ -415,8 +415,14 @@ def flush
       # Use \r to position at column 0, clear line, fill with spaces for reliability
       gap = body_space - body_rendered
       blank_line = "\r#{ANSI::CLEAR_EOL}#{' ' * (@width - 1)}\n"
-      gap.times do
-        @io.write(blank_line)
+      blank_line_no_newline = "\r#{ANSI::CLEAR_EOL}#{' ' * (@width - 1)}"
+      gap.times do |i|
+        # Last gap line without newline if no footer follows
+        if i == gap - 1 && @footer.lines.empty?
+          @io.write(blank_line_no_newline)
+        else
+          @io.write(blank_line)
+        end
         current_row += 1
       end
 

spec/tests/test_31_rename.sh

@@ -27,10 +27,10 @@ fi
 
 # Test: Rename dialog shows pencil emoji
 output=$(try_run --path="$REN_TEST_DIR" --and-keys='CTRL-R,ESC' exec 2>&1)
-if echo "$output" | grep -q "📝"; then
+if echo "$output" | grep -qE "📝|✏️"; then
     pass
 else
-    fail "Rename dialog should show pencil emoji" "📝" "$output" "rename"
+    fail "Rename dialog should show pencil emoji" "📝 or ✏️" "$output" "rename"
 fi
 
 # Test: Rename dialog pre-fills date prefix for dated entry
@@ -131,12 +131,12 @@ else
     fail "Rename dialog should have separator lines" "─ character" "$output" "rename"
 fi
 
-# Test: Rename shows current name in dialog
+# Test: Rename shows current name in dialog (with folder emoji)
 output=$(try_run --path="$REN_TEST_DIR" --and-keys='CTRL-R,ESC' exec 2>&1)
-if echo "$output" | grep -q "Current:"; then
+if echo "$output" | grep -qE "Current:|📁.*nodate-project"; then
     pass
 else
-    fail "Rename dialog should show Current: label" "Current:" "$output" "rename"
+    fail "Rename dialog should show current name" "Current: or 📁 with name" "$output" "rename"
 fi
 
 # Test: Rename shows new name field

test/tui_test.rb

@@ -37,7 +37,7 @@ def test_dim_wraps_with_palette
   def test_accent_and_highlight_helpers
     enable_colors!
     assert_includes Tui::Text.accent("wow"), Tui::Palette::ACCENT
-    assert_includes Tui::Text.highlight("hit"), Tui::Palette::MATCH
+    assert_includes Tui::Text.highlight("hit"), Tui::Palette::HIGHLIGHT
   end
 end
 
@@ -101,7 +101,7 @@ def test_write_bold_and_highlight
     writer.write_highlight("H")
     output = writer.to_s
     assert_includes output, Tui::ANSI::BOLD
-    assert_includes output, Tui::Palette::MATCH
+    assert_includes output, Tui::Palette::HIGHLIGHT
   end
 
   def test_fill_fills_remaining_width

try.rb

@@ -363,10 +363,11 @@ def render(tries)
 
   def render_entry_line(screen, entry, is_selected, width)
     is_marked = @marked_for_deletion.include?(entry[:path])
-    background = if is_selected
-      Tui::Palette::SELECTED_BG
-    elsif is_marked
+    # Marked items always show red; selection shows via arrow only
+    background = if is_marked
       Tui::Palette::DANGER_BG
+    elsif is_selected
+      Tui::Palette::SELECTED_BG
     end
 
     line = screen.body.add_line(background: background)
@@ -559,7 +560,13 @@ def render_rename_dialog(current_name, rename_buffer, rename_cursor, rename_erro
       prefix = "New name: "
       line.center.write_dim(prefix)
       line.center << screen.input("", value: rename_buffer, cursor: rename_cursor).to_s
-      line.mark_has_input((screen.width - Tui::Metrics.visible_width(prefix) - rename_buffer.length) / 2 + Tui::Metrics.visible_width(prefix))
+      # Input displays buffer + trailing space when cursor at end
+      # Use (width - 1) to match Line.render's max_content calculation
+      input_width = [rename_buffer.length, rename_cursor + 1].max
+      prefix_width = Tui::Metrics.visible_width(prefix)
+      max_content = screen.width - 1
+      center_start = (max_content - prefix_width - input_width) / 2
+      line.mark_has_input(center_start + prefix_width)
     end
 
     if rename_error
@@ -710,7 +717,13 @@ def render_delete_dialog(marked_items, confirmation_buffer, confirmation_cursor)
       prefix = "Type YES to confirm: "
       line.center.write_dim(prefix)
       line.center << screen.input("", value: confirmation_buffer, cursor: confirmation_cursor).to_s
-      line.mark_has_input((screen.width - Tui::Metrics.visible_width(prefix) - confirmation_buffer.length) / 2 + Tui::Metrics.visible_width(prefix))
+      # Input displays buffer + trailing space when cursor at end
+      # Use (width - 1) to match Line.render's max_content calculation
+      input_width = [confirmation_buffer.length, confirmation_cursor + 1].max
+      prefix_width = Tui::Metrics.visible_width(prefix)
+      max_content = screen.width - 1
+      center_start = (max_content - prefix_width - input_width) / 2
+      line.mark_has_input(center_start + prefix_width)
     end
 
     screen.footer.add_line { |line| line.write.write_dim(fill("─")) }
@@ -756,7 +769,7 @@ def process_delete_confirmation(marked_items, confirmation)
 # Main execution with OptionParser subcommands
 if __FILE__ == $0
 
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 
   def print_global_help
     text = <<~HELP
@@ -1120,10 +1133,12 @@ def script_delete(paths, base_path)
   end
 
   def script_rename(base_path, old_name, new_name)
+    new_path = File.join(base_path, new_name)
     [
       "cd #{q(base_path)}",
       "mv #{q(old_name)} #{q(new_name)}",
-      "cd #{q(File.join(base_path, new_name))}"
+      "echo #{q(new_path)}",
+      "cd #{q(new_path)}"
     ]
   end