fix(overlay): arrow-key dialog, human-readable input, dynamic popup height (#18)

Author: nnemirovsky

scripts/overlay-dialog.sh

@@ -95,7 +95,7 @@ propose_rule() {
 
 # ANSI helpers.
 BOLD='\033[1m'
-DIM='\033[2m'
+DIM='\033[34m'
 REVERSE='\033[7m'
 GREEN='\033[32m'
 RED='\033[31m'
@@ -229,7 +229,7 @@ render_main_menu() {
       printf "   %s\n" "${MENU_LABELS[$i]}"
     fi
   done
-  printf "\n${DIM}Use arrow keys or press a letter key${RESET}\n"
+  printf "\n\033[2mUse arrow keys or press a letter key\033[0m\n"
 }
 
 render_main_menu
@@ -322,7 +322,7 @@ render_confirm_menu() {
       printf "   %s\n" "${CONFIRM_LABELS[$i]}"
     fi
   done
-  printf "\n${DIM}Use arrow keys or press a letter key${RESET}\n"
+  printf "\n\033[2mUse arrow keys or press a letter key\033[0m\n"
 }
 
 render_confirm_menu

scripts/overlay.sh

@@ -137,10 +137,23 @@ _write_env_file() {
 }
 _write_env_file
 
+# Compute popup height dynamically based on content.
+_term_cols="$(tput cols 2>/dev/null || echo 120)"
+_popup_cols=$(( _term_cols * 80 / 100 ))
+[ "$_popup_cols" -lt 40 ] && _popup_cols=40
+_input_str="${PASSTHRU_OVERLAY_TOOL_INPUT_JSON:-}"
+_input_len="${#_input_str}"
+if [ "$_input_len" -gt 120 ]; then _input_len=120; fi
+_input_lines=$(( (_input_len + 7) / (_popup_cols - 8) + 1 ))
+[ "$_input_lines" -lt 1 ] && _input_lines=1
+_popup_height=$(( 12 + _input_lines ))
+[ "$_popup_height" -lt 13 ] && _popup_height=13
+[ "$_popup_height" -gt 30 ] && _popup_height=30
+
 launch_tmux() {
   # display-popup -E: close when the inner command exits.
   # -w 80% -h 60%: large enough for the menu + rule preview, still overlay-y.
-  tmux display-popup -E -w 80% -h 60% -- \
+  tmux display-popup -E -w 80% -h "$_popup_height" -- \
     bash -c ". '$_ENV_FILE' && rm -f '$_ENV_FILE' && exec bash '$DIALOG'"
 }
 

tests/overlay.bats

@@ -31,7 +31,7 @@ setup() {
   local cmd
   for cmd in jq perl bash cat sed awk printf tr sort uniq comm head tail \
              mkdir rm cp mv ln ls chmod date mktemp find grep wc tee touch \
-             dirname basename realpath readlink env sha256sum shasum; do
+             dirname basename realpath readlink env sha256sum shasum tput; do
     local src
     src="$(command -v "$cmd" 2>/dev/null || true)"
     if [ -n "$src" ] && [ -x "$src" ]; then
@@ -102,7 +102,7 @@ restricted_path() {
   grep -q 'display-popup' "$TMP/tmux.log"
   grep -q -- '-E' "$TMP/tmux.log"
   grep -q -- '-w 80%' "$TMP/tmux.log"
-  grep -q -- '-h 60%' "$TMP/tmux.log"
+  grep -qE -- '-h [0-9]+' "$TMP/tmux.log"
   # Dialog ran -> result file has the verdict.
   [ -f "$TMP/result.txt" ]
   run cat "$TMP/result.txt"

tests/overlay_config.bats

@@ -27,7 +27,7 @@ setup() {
   local cmd
   for cmd in jq perl bash cat sed awk printf tr sort uniq comm head tail \
              mkdir rm cp mv ln ls chmod date mktemp find grep wc tee touch \
-             dirname basename realpath readlink env sha256sum shasum; do
+             dirname basename realpath readlink env sha256sum shasum tput; do
     local src
     src="$(command -v "$cmd" 2>/dev/null || true)"
     if [ -n "$src" ] && [ -x "$src" ]; then