2 files changed, 19 insertions, 1 deletions

diff --git a/src/cli.rs b/src/cli.rs
index a18b8f1..0da3078 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -37,6 +37,8 @@ pub enum Commands {
     Pause,
     /// Resume playback
     Resume,
+    /// Toggle play/pause
+    Toggle,
     /// Stop playback
     StopPlayback,
     /// Skip to next track
@@ -133,6 +135,9 @@ impl Cli {
             Commands::Resume => {
                 crate::daemon::send_command("resume".to_string())?;
             }
+            Commands::Toggle => {
+                crate::daemon::send_command("toggle".to_string())?;
+            }
             Commands::StopPlayback => {
                 crate::daemon::send_command("stop".to_string())?;
             }
diff --git a/src/daemon.rs b/src/daemon.rs
index dab0e5a..3379c7b 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -475,6 +475,15 @@ fn process_command(
             audio.resume();
             "Resumed\n".to_string()
         }
+        "toggle" => {
+            if audio.is_playing() {
+                audio.pause();
+                "Paused\n".to_string()
+            } else {
+                audio.resume();
+                "Resumed\n".to_string()
+            }
+        }
         "stop" => {
             audio.stop();
             // Clear queue on stop
@@ -685,6 +694,10 @@ fn process_command(
                 } else {
                     let mut output = String::new();
                     let current_position = q.position;
+                    let playing_track_idx = match q.shuffle {
+                        ShuffleMode::None => current_position,
+                        _ => *q.shuffled_indices.get(current_position).unwrap_or(&0),
+                    };
                     // Use shuffled_indices for display order if shuffle is on
                     let indices: Vec<usize> = if let ShuffleMode::None = q.shuffle {
                         (0..q.tracks.len()).collect()
@@ -694,7 +707,7 @@ fn process_command(
                     for (display_idx, &track_idx) in indices.iter().enumerate() {
                         if let Some(track) = q.tracks.get(track_idx) {
                             let track_str = track.display_string(display_idx);
-                            if track_idx == current_position {
+                            if track_idx == playing_track_idx {
                                 output.push_str(&format!("> {} (playing)\n", track_str));
                             } else {
                                 output.push_str(&format!("  {}\n", track_str));