ci: remove corrupted .deb files before dpkg-scanpackages

- Add Forgejo release workflow with .deb, Homebrew tap and APT updates.
- Remove obsolete GitHub Actions release workflow.
- Update Cargo.toml repository and homepage URLs to git.janvete.com.

.forgejo/workflows/release.yml

@@ -0,0 +1,165 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    container:
+      image: rust:bookworm
+      volumes:
+        - /opt/runner/keys:/keys:ro
+
+    steps:
+      - name: Install tools
+        run: |
+          apt-get update
+          apt-get install -y dpkg-dev git curl openssh-client
+
+      - name: Setup SSH
+        run: |
+          test -r /keys/forgejo_runner || { echo "Deploy key /keys/forgejo_runner chybi"; exit 1; }
+          install -m 600 /keys/forgejo_runner /tmp/forgejo_runner
+          echo "GIT_SSH_COMMAND=ssh -p 554 -i /tmp/forgejo_runner -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR" >> "$GITHUB_ENV"
+
+      - name: Checkout source
+        run: |
+          git clone ssh://git@git-ssh.janvete.com:554/seth/lines.git src
+          cd src
+          git checkout "${{ github.ref_name }}"
+
+      - name: Build Linux release binary and .deb
+        working-directory: src
+        run: |
+          VERSION=${{ github.ref_name }}
+          VER=${VERSION#v}
+          mkdir -p dist
+
+          cargo build --release
+
+          # .deb package
+          DEB_DIR="lines_${VER}_amd64"
+          mkdir -p "${DEB_DIR}/DEBIAN" "${DEB_DIR}/usr/bin"
+          cp target/release/lines "${DEB_DIR}/usr/bin/lines"
+          chmod 755 "${DEB_DIR}/usr/bin/lines"
+
+          cat > "${DEB_DIR}/DEBIAN/control" << CONTROL
+          Package: lines
+          Version: ${VER}
+          Section: utils
+          Priority: optional
+          Architecture: amd64
+          Maintainer: janvete <jan.vete@example.com>
+          Description: TUI for running frequently used commands from markdown files
+          CONTROL
+
+          dpkg-deb --build "${DEB_DIR}" "dist/${DEB_DIR}.deb"
+
+          # Linux tarball
+          STAGING=$(mktemp -d)
+          cp target/release/lines "${STAGING}/lines"
+          tar -czf "dist/lines-${VERSION}-linux-amd64.tar.gz" -C "${STAGING}" lines
+          rm -rf "${STAGING}"
+
+      - name: Print checksums
+        working-directory: src
+        run: |
+          echo "=== SHA256 checksums ==="
+          sha256sum dist/*
+
+      - name: Create Forgejo Release
+        working-directory: src
+        env:
+          FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
+          FORGEJO_URL: https://git.janvete.com
+        run: |
+          VERSION=${{ github.ref_name }}
+          API="${FORGEJO_URL}/api/v1/repos/seth/lines"
+
+          RELEASE_JSON=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -X POST \
+            -d "{\"tag_name\":\"${VERSION}\",\"name\":\"${VERSION}\",\"draft\":false,\"prerelease\":false}" \
+            "${API}/releases")
+
+          echo "Create release response: ${RELEASE_JSON}"
+          RELEASE_ID=$(echo "${RELEASE_JSON}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+
+          if [ -z "${RELEASE_ID}" ]; then
+            echo "Release may already exist, fetching existing release..."
+            EXISTING=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
+              "${API}/releases/tags/${VERSION}")
+            echo "Existing release response: ${EXISTING}"
+            RELEASE_ID=$(echo "${EXISTING}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
+          fi
+
+          if [ -z "${RELEASE_ID}" ]; then
+            echo "Failed to create or fetch release"
+            exit 1
+          fi
+
+          for ARCHIVE in dist/*; do
+            [ -e "${ARCHIVE}" ] || continue
+            NAME=$(basename "${ARCHIVE}")
+            case "${NAME}" in
+              *.tar.gz) CONTENT_TYPE="application/gzip" ;;
+              *.deb)    CONTENT_TYPE="application/vnd.debian.binary-package" ;;
+              *)        CONTENT_TYPE="application/octet-stream" ;;
+            esac
+            curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
+              -H "Content-Type: ${CONTENT_TYPE}" \
+              --data-binary "@${ARCHIVE}" \
+              "${API}/releases/${RELEASE_ID}/assets?name=${NAME}"
+            echo "Uploaded ${NAME}"
+          done
+
+      - name: Update APT repository
+        working-directory: src
+        run: |
+          VERSION=${{ github.ref_name }}
+
+          git clone ssh://git@git-ssh.janvete.com:554/seth/apt.git apt-repo
+          cp dist/*.deb apt-repo/
+
+          cd apt-repo
+
+          # Remove any corrupted .deb files left from previous failed runs
+          for f in *.deb; do
+            [ -e "$f" ] || continue
+            if ! dpkg-deb -I "$f" >/dev/null 2>&1; then
+              echo "Removing corrupted package: $f"
+              rm -f "$f"
+            fi
+          done
+
+          dpkg-scanpackages . > Packages
+          gzip -k -f Packages
+
+          cat > Release << RELEASE
+          Origin: janvete
+          Label: janvete
+          Suite: stable
+          Codename: stable
+          Version: 1.0
+          Architectures: amd64
+          Components: main
+          Description: janvete tools APT repository
+          Date: $(date -Ru)
+          RELEASE
+
+          {
+            echo "SHA256:"
+            for f in Packages Packages.gz *.deb; do
+              [ -e "$f" ] || continue
+              printf " %s %16d %s\n" "$(sha256sum "$f" | cut -d' ' -f1)" "$(stat -c%s "$f")" "$f"
+            done
+          } >> Release
+
+          git config user.email "forgejo-actions[bot]@janvete.com"
+          git config user.name "forgejo-actions[bot]"
+          git add -A
+          git commit -m "chore: add lines ${VERSION}"
+          git push

.github/workflows/release.yml

@@ -1,34 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: write
-
-jobs:
-  build-deb:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: Install cargo-deb
-        run: cargo install cargo-deb
-
-      - name: Build release binary
-        run: cargo build --release
-
-      - name: Build .deb package
-        run: cargo deb --no-build
-
-      - name: Upload .deb to release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: target/debian/*.deb
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.lock

@@ -825,7 +825,7 @@ dependencies = [
 
 [[package]]
 name = "lines"
-version = "0.1.16"
+version = "0.1.21"
 dependencies = [
  "base64",
  "chrono",

Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "lines"
-version = "0.1.16"
+version = "0.1.21"
 edition = "2024"
 authors = ["janvete"]
 description = "TUI for running frequently used commands"
 license = "MIT"
-repository = "https://github.com/janvete/lines"
-homepage = "https://github.com/janvete/lines"
+repository = "https://git.janvete.com/seth/lines"
+homepage = "https://git.janvete.com/seth/lines"
 keywords = ["cli", "tui", "ssh", "commands"]
 categories = ["command-line-utilities"]
 

README.md

@@ -7,24 +7,22 @@ A TUI app for quickly running frequently used commands — ideal for SSH scripts
 ### macOS (Homebrew)
 
 ```bash
-brew tap janvete/tools
+brew tap janvete/tools https://git.janvete.com/seth/homebrew-tools.git
 brew install lines
 ```
 
-### Debian / Ubuntu (.deb)
-
-Download the latest `.deb` from the [GitHub Releases](https://github.com/janvete/lines/releases) page and install it:
+### Debian / Ubuntu (APT)
 
 ```bash
-sudo apt install ./lines_*.deb
-# or
-sudo dpkg -i lines_*.deb
+echo "deb [trusted=yes] https://git.janvete.com/seth/apt/raw/branch/main ./" | sudo tee /etc/apt/sources.list.d/janvete.list
+sudo apt update
+sudo apt install lines
 ```
 
 ### From source
 
 ```bash
-cargo install --git https://github.com/janvete/lines
+cargo install --git ssh://git@git-ssh.janvete.com:554/seth/lines
 ```
 
 ## Usage
@@ -123,6 +121,8 @@ Use `{}` as a placeholder if your lines are just addresses:
 ssh {} lsblk
 ```
 
+Variables like `$HOME` or `$USER` are treated as remote-shell variables, so they are expanded on the target host, not by your local shell.
+
 ## Global search
 
 Press `/` to search across all commands, files, groups, and section names. Type your query, use `↑/↓` to select a result, and press `Enter` to run it.

src/app.rs

@@ -40,6 +40,7 @@ pub struct PendingCommand {
 pub enum CustomFocus {
     Lines,
     Input,
+    PreCommand,
 }
 
 #[derive(Debug, Clone)]
@@ -55,6 +56,7 @@ pub struct CustomState {
     pub cursor: usize,
     pub focus: CustomFocus,
     pub command: String,
+    pub pre_command: String,
     pub list_state: ListState,
 }
 
@@ -81,6 +83,7 @@ impl CustomState {
             cursor: 0,
             focus: CustomFocus::Lines,
             command: String::new(),
+            pre_command: String::new(),
             list_state,
         }
     }
@@ -115,12 +118,12 @@ impl CustomState {
             .collect()
     }
 
-    pub fn focus_input(&mut self) {
-        self.focus = CustomFocus::Input;
-    }
-
-    pub fn focus_lines(&mut self) {
-        self.focus = CustomFocus::Lines;
+    pub fn cycle_focus(&mut self) {
+        self.focus = match self.focus {
+            CustomFocus::Lines => CustomFocus::Input,
+            CustomFocus::Input => CustomFocus::PreCommand,
+            CustomFocus::PreCommand => CustomFocus::Lines,
+        };
     }
 
     pub fn toggle_all(&mut self) {

src/custom.rs

@@ -2,7 +2,9 @@ use crate::app::CustomState;
 
 pub fn build_commands(state: &CustomState) -> Vec<String> {
     let command = state.command.trim();
-    if command.is_empty() {
+    let pre_command = state.pre_command.trim();
+
+    if command.is_empty() && pre_command.is_empty() {
         return Vec::new();
     }
 
@@ -11,25 +13,51 @@ pub fn build_commands(state: &CustomState) -> Vec<String> {
         return Vec::new();
     }
 
+    let prefix = if pre_command.is_empty() {
+        String::new()
+    } else {
+        format!("{} ", pre_command)
+    };
+
     selected
         .iter()
         .map(|line| {
             let line = line.trim();
-            if command.contains("{}") {
-                command.replace("{}", line)
+            let built = if command.is_empty() {
+                line.to_string()
+            } else if command.contains("{}") {
+                escape_dollars(&command.replace("{}", line))
             } else {
-                format!("{} \"{}\"", line, command.replace('"', "\\\""))
-            }
+                let escaped = escape_dollars(command).replace('"', "\\\"");
+                format!("{} \"{}\"", line, escaped)
+            };
+            format!("{}{}", prefix, built)
         })
         .collect()
 }
 
+/// Escape `$` as `\$` unless it is already escaped, so that variables are
+/// expanded by the remote shell rather than the local one when the built
+/// command is passed to `ssh`.
+fn escape_dollars(command: &str) -> String {
+    let mut result = String::with_capacity(command.len());
+    let mut prev_backslash = false;
+    for c in command.chars() {
+        if c == '$' && !prev_backslash {
+            result.push('\\');
+        }
+        result.push(c);
+        prev_backslash = c == '\\' && !prev_backslash;
+    }
+    result
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use crate::app::{CustomLine, CustomState};
 
-    fn make_state(lines: Vec<&str>, selected: Vec<bool>, command: &str) -> CustomState {
+    fn make_state(lines: Vec<&str>, selected: Vec<bool>, command: &str, pre_command: &str) -> CustomState {
         let mut list_state = ratatui::widgets::ListState::default();
         list_state.select(Some(0));
         CustomState {
@@ -44,6 +72,7 @@ mod tests {
             cursor: 0,
             focus: crate::app::CustomFocus::Lines,
             command: command.to_string(),
+            pre_command: pre_command.to_string(),
             list_state,
         }
     }
@@ -54,6 +83,7 @@ mod tests {
             vec!["ssh root@ip1", "ssh root@ip2", "ssh root@ip3"],
             vec![false, true, true],
             "lsblk",
+            "",
         );
         assert_eq!(
             build_commands(&state),
@@ -63,7 +93,7 @@ mod tests {
 
     #[test]
     fn test_build_commands_placeholder() {
-        let state = make_state(vec!["root@ip1", "root@ip2"], vec![true, true], "ssh {} lsblk");
+        let state = make_state(vec!["root@ip1", "root@ip2"], vec![true, true], "ssh {} lsblk", "");
         assert_eq!(
             build_commands(&state),
             vec!["ssh root@ip1 lsblk", "ssh root@ip2 lsblk"]
@@ -72,7 +102,81 @@ mod tests {
 
     #[test]
     fn test_build_commands_empty_selection() {
-        let state = make_state(vec!["ssh root@ip1"], vec![false], "lsblk");
+        let state = make_state(vec!["ssh root@ip1"], vec![false], "lsblk", "");
         assert!(build_commands(&state).is_empty());
     }
+
+    #[test]
+    fn test_build_commands_pre_command() {
+        let state = make_state(
+            vec!["ssh root@ip1", "ssh root@ip2"],
+            vec![true, true],
+            "ping",
+            "lview",
+        );
+        assert_eq!(
+            build_commands(&state),
+            vec![
+                "lview ssh root@ip1 \"ping\"",
+                "lview ssh root@ip2 \"ping\""
+            ]
+        );
+    }
+
+    #[test]
+    fn test_build_commands_pre_command_placeholder() {
+        let state = make_state(
+            vec!["root@ip1", "root@ip2"],
+            vec![true, true],
+            "ssh {} lsblk",
+            "lview",
+        );
+        assert_eq!(
+            build_commands(&state),
+            vec!["lview ssh root@ip1 lsblk", "lview ssh root@ip2 lsblk"]
+        );
+    }
+
+    #[test]
+    fn test_build_commands_pre_command_only() {
+        let state = make_state(vec!["ssh root@ip1", "ssh root@ip2"], vec![false, true], "", "lview");
+        assert_eq!(build_commands(&state), vec!["lview ssh root@ip2"]);
+    }
+
+    #[test]
+    fn test_build_commands_escapes_dollar_variables() {
+        let state = make_state(
+            vec!["ssh root@ip1"],
+            vec![true],
+            "echo $HOME && echo $USER",
+            "",
+        );
+        assert_eq!(
+            build_commands(&state),
+            vec!["ssh root@ip1 \"echo \\$HOME && echo \\$USER\""]
+        );
+    }
+
+    #[test]
+    fn test_build_commands_preserves_already_escaped_dollars() {
+        let state = make_state(
+            vec!["ssh root@ip1"],
+            vec![true],
+            "echo \\$HOME",
+            "",
+        );
+        assert_eq!(
+            build_commands(&state),
+            vec!["ssh root@ip1 \"echo \\$HOME\""]
+        );
+    }
+
+    #[test]
+    fn test_build_commands_placeholder_escapes_dollars() {
+        let state = make_state(vec!["root@ip1"], vec![true], "ssh {} echo $HOSTNAME", "");
+        assert_eq!(
+            build_commands(&state),
+            vec!["ssh root@ip1 echo \\$HOSTNAME"]
+        );
+    }
 }

src/events.rs

@@ -1,21 +1,25 @@
-use crossterm::event::{self, Event, KeyCode, KeyEventKind};
+use crossterm::event::{self, Event, KeyCode, KeyEventKind, MouseEventKind};
 use std::io;
 use std::time::Duration;
 
-use crate::app::{App, CustomFocus, PendingCommand, Screen};
+use crate::app::{App, CustomFocus, CustomState, PendingCommand, Screen};
 use crate::commands::{edit_file, run_section};
 use crate::custom::build_commands;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 pub enum AppEvent {
     Tick,
     Key(event::KeyEvent),
+    Mouse(event::MouseEvent),
+    Paste(String),
 }
 
 pub fn poll_event(timeout: Duration) -> io::Result<Option<AppEvent>> {
     if event::poll(timeout)? {
         match event::read()? {
             Event::Key(key) => Ok(Some(AppEvent::Key(key))),
+            Event::Mouse(mouse) => Ok(Some(AppEvent::Mouse(mouse))),
+            Event::Paste(text) => Ok(Some(AppEvent::Paste(text))),
             _ => Ok(Some(AppEvent::Tick)),
         }
     } else {
@@ -37,6 +41,50 @@ pub fn handle_event(app: &mut App, event: AppEvent) -> bool {
                 Screen::Search => handle_search_event(app, key),
             }
         }
+        AppEvent::Mouse(mouse) => match mouse.kind {
+            MouseEventKind::ScrollDown => {
+                scroll_down(app);
+                true
+            }
+            MouseEventKind::ScrollUp => {
+                scroll_up(app);
+                true
+            }
+            _ => true,
+        },
+        AppEvent::Paste(text) => handle_paste_event(app, &text),
+    }
+}
+
+fn scroll_down(app: &mut App) {
+    match app.screen {
+        Screen::Main => app.next(),
+        Screen::Custom => {
+            if let Some(state) = app.custom_state.as_mut() {
+                state.next();
+            }
+        }
+        Screen::Search => {
+            if let Some(state) = app.search_state.as_mut() && !state.results.is_empty() {
+                state.cursor = (state.cursor + 1) % state.results.len();
+            }
+        }
+    }
+}
+
+fn scroll_up(app: &mut App) {
+    match app.screen {
+        Screen::Main => app.previous(),
+        Screen::Custom => {
+            if let Some(state) = app.custom_state.as_mut() {
+                state.previous();
+            }
+        }
+        Screen::Search => {
+            if let Some(state) = app.search_state.as_mut() && !state.results.is_empty() {
+                state.cursor = state.cursor.checked_sub(1).unwrap_or(state.results.len() - 1);
+            }
+        }
     }
 }
 
@@ -115,11 +163,7 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
             app.exit_custom();
         }
         KeyCode::Tab => {
-            if state.focus == CustomFocus::Lines {
-                state.focus_input();
-            } else {
-                state.focus_lines();
-            }
+            state.cycle_focus();
         }
         KeyCode::Down => {
             if state.focus == CustomFocus::Lines {
@@ -135,21 +179,21 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
             if state.focus == CustomFocus::Lines {
                 state.toggle();
             } else {
-                state.command.push(' ');
+                push_to_active_input(state, ' ');
             }
         }
         KeyCode::Char('a') => {
             if state.focus == CustomFocus::Lines {
                 state.toggle_all();
             } else {
-                state.command.push('a');
+                push_to_active_input(state, 'a');
             }
         }
         KeyCode::Backspace => {
-            state.command.pop();
+            pop_from_active_input(state);
         }
         KeyCode::Enter => {
-            if state.focus == CustomFocus::Input {
+            if state.focus == CustomFocus::Input || state.focus == CustomFocus::PreCommand {
                 let commands = build_commands(state);
                 if !commands.is_empty()
                     && let (Some(file), Some(group)) = (app.current_file(), app.current_group())
@@ -163,17 +207,70 @@ fn handle_custom_event(app: &mut App, key: event::KeyEvent) -> bool {
                     return false;
                 }
             } else {
-                state.focus_input();
+                state.focus = CustomFocus::Input;
             }
         }
         KeyCode::Char(c) => {
-            state.command.push(c);
+            if state.focus == CustomFocus::Lines {
+                state.command.push(c);
+            } else {
+                push_to_active_input(state, c);
+            }
         }
         _ => {}
     }
     true
 }
 
+fn push_to_active_input(state: &mut CustomState, c: char) {
+    match state.focus {
+        CustomFocus::Input => state.command.push(c),
+        CustomFocus::PreCommand => state.pre_command.push(c),
+        CustomFocus::Lines => {}
+    }
+}
+
+fn pop_from_active_input(state: &mut CustomState) {
+    match state.focus {
+        CustomFocus::Input => {
+            state.command.pop();
+        }
+        CustomFocus::PreCommand => {
+            state.pre_command.pop();
+        }
+        CustomFocus::Lines => {}
+    }
+}
+
+fn handle_paste_event(app: &mut App, text: &str) -> bool {
+    match app.screen {
+        Screen::Main => true,
+        Screen::Custom => {
+            let Some(state) = app.custom_state.as_mut() else {
+                app.exit_custom();
+                return true;
+            };
+            match state.focus {
+                CustomFocus::Input => state.command.push_str(text),
+                CustomFocus::PreCommand => state.pre_command.push_str(text),
+                CustomFocus::Lines => {}
+            }
+            true
+        }
+        Screen::Search => {
+            let Some(state) = app.search_state.as_mut() else {
+                app.exit_search();
+                return true;
+            };
+            // Search queries are single-line; keep only the first pasted line.
+            let query = text.lines().next().unwrap_or(text);
+            state.query.push_str(query);
+            app.update_search();
+            true
+        }
+    }
+}
+
 fn handle_search_event(app: &mut App, key: event::KeyEvent) -> bool {
     let Some(state) = app.search_state.as_mut() else {
         app.exit_search();

src/main.rs

@@ -14,7 +14,9 @@ use std::time::Duration;
 
 use clap::Parser;
 use crossterm::{
-    event::{DisableMouseCapture, EnableMouseCapture},
+    event::{
+        DisableBracketedPaste, DisableMouseCapture, EnableBracketedPaste, EnableMouseCapture,
+    },
     execute,
     terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
 };
@@ -54,7 +56,12 @@ fn main() -> io::Result<()> {
 
     enable_raw_mode()?;
     let mut stdout = io::stdout();
-    execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
+    execute!(
+        stdout,
+        EnterAlternateScreen,
+        EnableMouseCapture,
+        EnableBracketedPaste
+    )?;
     let backend = CrosstermBackend::new(stdout);
     let mut terminal = Terminal::new(backend)?;
 
@@ -64,7 +71,8 @@ fn main() -> io::Result<()> {
     execute!(
         terminal.backend_mut(),
         LeaveAlternateScreen,
-        DisableMouseCapture
+        DisableMouseCapture,
+        DisableBracketedPaste
     )?;
     terminal.show_cursor()?;
 

src/ui.rs

@@ -50,6 +50,7 @@ fn draw_custom(f: &mut Frame, app: &mut App) {
         .constraints([
             Constraint::Min(5),
             Constraint::Length(5),
+            Constraint::Length(5),
             Constraint::Length(1),
         ])
         .split(f.area());
@@ -111,13 +112,27 @@ fn draw_custom(f: &mut Frame, app: &mut App) {
         .wrap(Wrap { trim: true });
     f.render_widget(input, chunks[1]);
 
-    let help = "↑/↓: move | Space: toggle | a: select all | Tab: focus | Enter: run | Esc: back";
+    let pre_command = Paragraph::new(state.pre_command.as_str())
+        .block(
+            Block::default()
+                .title(" Pre-command ")
+                .borders(Borders::ALL)
+                .border_style(if state.focus == CustomFocus::PreCommand {
+                    Style::default().fg(Color::Yellow)
+                } else {
+                    Style::default().fg(Color::DarkGray)
+                }),
+        )
+        .wrap(Wrap { trim: true });
+    f.render_widget(pre_command, chunks[2]);
+
+    let help = "↑/↓: move | Space: toggle | a: select all | Tab: focus | Enter: run | Esc: back | scroll: move";
     let text = match &app.message {
         Some(msg) => Text::from(msg.as_str()),
         None => Text::from(help),
     };
     let paragraph = Paragraph::new(text).style(Style::default().fg(Color::Gray));
-    f.render_widget(paragraph, chunks[2]);
+    f.render_widget(paragraph, chunks[3]);
 }
 
 fn draw_search(f: &mut Frame, app: &mut App) {
@@ -158,11 +173,15 @@ fn draw_search(f: &mut Frame, app: &mut App) {
             } else {
                 Style::default()
             };
-            ListItem::new(format!(
-                "[{}] {} — {}",
-                result.group, result.file, result.section
-            ))
-            .style(style)
+            let label = if result.command.is_empty() {
+                format!("[{}] {} — {}", result.group, result.file, result.section)
+            } else {
+                format!(
+                    "[{}] {} — {} — {}",
+                    result.group, result.file, result.section, result.command
+                )
+            };
+            ListItem::new(label).style(style)
         })
         .collect();