muxr 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e431ecab7ea6e49cf31e2865c3c870603847e422c9c1e5dfc8b86ff413b95f5
-  data.tar.gz: e6db50aba85439befa78b6c89ec5dcd09f6d3cfa66195e0d552f403c229b7932
+  metadata.gz: ab53a383e7781f83ff106e503047cf5952b12193d0d65e2b29631f2beda6bcf5
+  data.tar.gz: 0fcef17549ae1745d76fe530a97f12740c9556704bbe724f1b4690932c7cabc5
 SHA512:
-  metadata.gz: 2f0513da3cfba34c6efbc73c398934ada15ccb00b29958d4b5bf70b397cb7110819da8915acbbd13db4a8dd9d922551e3bf70d09c2dbf6247e2ebea598d2f9b5
-  data.tar.gz: 9f0dcefe6bd25d5173044d88b81fc4efac0872b5961f010ed33e370335f341f2ee2ec98b5d0ed1ee50036a3675ba96ad3b33b50d95397ef32c6726eaabe0a29a
+  metadata.gz: 4440cb89e4295407dce42ca26c474c64441ff556cb285769b085e0474448132085d9bb6ad9af91699e6349a915c90fe6ebd33825d7ee68f315cafc26ccac5244
+  data.tar.gz: e17c2f092dcd76ca617bfbfd6acdf1e5475ea9fd7afe0a7458539af95eaa32b0282d499a094f19a6887b6fd228f03d470d5a8c6b9b167b9838e6989edd20ee74

data/CHANGELOG.md

@@ -6,6 +6,31 @@ follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.1.2] - 2026-05-11
+
+### Added
+- Vim-style word and viewport motions in copy-mode selection cursor:
+  `w`/`W`/`e`/`E`/`b`/`B` walk word and WORD boundaries, `^` jumps to
+  the first non-blank on the line, and `H`/`M`/`L` land on the visible
+  top/middle/bottom rows. Yanking now drops straight back to the live
+  shell (matching vim's `v…y` returning to normal mode); the tmux-style
+  `b` alias for page-back is now `Ctrl-b` only.
+
+### Fixed
+- Honor SGR 2 (dim) so faint text actually renders faint. The emulator
+  was silently dropping the attribute, which left Claude Code's
+  suggested-prompt placeholder rendering at normal intensity. SGR 22
+  now correctly clears both bold and dim per spec.
+
+## [0.1.1] - 2026-05-11
+
+### Fixed
+- `muxr --list` now reports sessions whose server is actually running
+  (live sockets in `~/.muxr/sockets/`) instead of `~/.muxr/sessions/*.json`,
+  which only exist after an explicit `:save` and so missed every live
+  session. The saved-snapshot enumeration is still available internally
+  via `Muxr::Session.list`.
+
 ## [0.1.0] - 2026-05-11
 
 Initial release.
@@ -42,5 +67,7 @@ Initial release.
   boundaries.
 - Renderer that composes one frame and diff-emits ANSI to STDOUT.
 
-[Unreleased]: https://github.com/roelbondoc/muxr/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/roelbondoc/muxr/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/roelbondoc/muxr/releases/tag/v0.1.2
+[0.1.1]: https://github.com/roelbondoc/muxr/releases/tag/v0.1.1
 [0.1.0]: https://github.com/roelbondoc/muxr/releases/tag/v0.1.0

data/README.md

@@ -20,6 +20,27 @@ the active layout decides geometry.
  [default] panes:3 layout:tall focused:#1 drawer:shown     muxr ^a ?
 ```
 
+## Screenshots
+
+The three built-in layouts (cycle with `C-a Tab`):
+
+<table>
+  <tr>
+    <td align="center"><strong>tall</strong><br/>master + stacked slaves</td>
+    <td align="center"><strong>grid</strong><br/>even tiling</td>
+    <td align="center"><strong>monocle</strong><br/>focused pane fullscreen</td>
+  </tr>
+  <tr>
+    <td><img src="docs/screenshots/01-layout-tall.png" alt="tall layout"></td>
+    <td><img src="docs/screenshots/02-layout-grid.png" alt="grid layout"></td>
+    <td><img src="docs/screenshots/03-layout-monocle.png" alt="monocle layout"></td>
+  </tr>
+</table>
+
+The Quake-style drawer overlay (`C-a ~`):
+
+![drawer overlay](docs/screenshots/04-drawer.png)
+
 ## Install / run
 
 ```bash
@@ -70,17 +91,33 @@ the pane title gains `[scrollback N/M]`.
 |-------------------------|-------------------------------------|
 | `j` / `k`               | scroll one line                     |
 | `d` / `u` (or `C-d`/`C-u`) | half page                        |
-| `f` / `b` / Space (or `C-f`/`C-b`) | full page                |
+| `f` / Space (or `C-f`/`C-b`) | full page                      |
 | `g` / `G`               | top / bottom                        |
 | `q` / `Esc` / `C-c`     | exit back to live view              |
 
-Press `v` inside scrollback to enter a movable-cursor selection mode
-(`h j k l`, `0`/`$`, `g`/`G`, `C-d`/`C-u`, `C-f`/`C-b`, Space). Press `v`
-again to anchor a character selection or `C-v` to anchor a block
-(rectangular) selection — toggling between the two preserves the anchor.
-`y` or Enter yanks the selection into an internal buffer and pipes it to
-`pbcopy` in the background (silent no-op when `pbcopy` is unavailable).
-`C-a ]` writes the yank buffer back into the focused pane.
+Press `v` inside scrollback to enter a movable-cursor selection mode.
+Vim-style motions are supported:
+
+| Keys                    | Action                              |
+|-------------------------|-------------------------------------|
+| `h` / `j` / `k` / `l`   | left / down / up / right            |
+| `0` / `^` / `$`         | line start / first non-blank / line end |
+| `w` / `W`               | next word / WORD start              |
+| `e` / `E`               | next word / WORD end                |
+| `b` / `B`               | previous word / WORD start          |
+| `g` / `G`               | top / bottom of timeline            |
+| `H` / `M` / `L`         | top / middle / bottom of viewport   |
+| `C-d`/`C-u`, `C-f`/`C-b`, Space | half / full page             |
+| `v` / `C-v`             | anchor char / block selection (toggle) |
+| `y` or Enter            | yank and exit to live shell         |
+| `q` / `Esc` / `C-c`     | cancel back to scrollback           |
+
+`v` and `C-v` toggle between character and block (rectangular) selection
+— switching between the two preserves the anchor. `y` or Enter yanks the
+selection into an internal buffer, pipes it to `pbcopy` in the background
+(silent no-op when `pbcopy` is unavailable), and drops you straight back
+to the live shell. `C-a ]` writes the yank buffer back into the focused
+pane.
 
 ## Commands (typed after `C-a :`)
 

data/bin/muxr

@@ -13,7 +13,7 @@ if ARGV.include?("-v") || ARGV.include?("--version")
 end
 
 if ARGV.include?("-l") || ARGV.include?("--list")
-  names = Muxr::Session.list
+  names = Muxr::Application.list_active
   puts names.join("\n") unless names.empty?
   exit 0
 end
@@ -26,7 +26,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       muxr                 attach the default session (auto-spawn if needed)
       muxr <name>          attach (or start) the named session
       muxr -s <name>       same as above
-      muxr --list          list saved session files and exit
+      muxr --list          list running sessions and exit
       muxr --version       print version and exit
       muxr --help          this help
 

data/lib/muxr/application.rb

@@ -26,6 +26,27 @@ module Muxr
       File.join(SOCKETS_DIR, "#{name}.sock")
     end
 
+    # Names of sessions whose server socket is currently accepting connections.
+    # Stale sockets (file exists, no listener) are skipped but left in place;
+    # cleanup happens on the next attach attempt.
+    def self.list_active
+      return [] unless File.directory?(SOCKETS_DIR)
+      Dir.children(SOCKETS_DIR).filter_map do |entry|
+        next unless entry.end_with?(".sock")
+        path = File.join(SOCKETS_DIR, entry)
+        next unless alive_socket?(path)
+        File.basename(entry, ".sock")
+      end.sort
+    end
+
+    def self.alive_socket?(path)
+      return false unless File.exist?(path)
+      UNIXSocket.new(path).close
+      true
+    rescue SystemCallError
+      false
+    end
+
     def initialize(argv = [])
       @argv = argv
       @session_name = parse_session_name(argv)
@@ -281,6 +302,7 @@ module Muxr
     def exit_selection(yank:)
       target = focused_target
       term = target&.terminal
+      yanked = false
       if yank
         # No anchor → no-op. User is still positioning; they can press v
         # first, then yank. Esc/q is the way to exit from navigation.
@@ -290,10 +312,18 @@ module Muxr
           @paste_buffer = text
           spawn_pbcopy(text)
           flash("yanked #{text.bytesize} bytes")
+          yanked = true
         end
       end
       term&.clear_selection
-      @input.enter_scrollback_mode
+      if yanked
+        # vim-style: yanking drops you straight back to "normal" (idle),
+        # not back into scrollback navigation.
+        term&.scroll_to_bottom
+        @input.enter_idle_mode
+      else
+        @input.enter_scrollback_mode
+      end
       @renderer.reset_frame!
       invalidate
     end
@@ -315,8 +345,18 @@ module Muxr
       when :full_down  then term.move_selection_cursor_by([rows - 1, 1].max, 0)
       when :line_start then term.selection_cursor_to_line_start
       when :line_end   then term.selection_cursor_to_line_end
-      when :top        then term.selection_cursor_to_top
-      when :bottom     then term.selection_cursor_to_bottom
+      when :line_first_nonblank then term.selection_cursor_to_first_non_blank
+      when :top              then term.selection_cursor_to_top
+      when :bottom           then term.selection_cursor_to_bottom
+      when :screen_top       then term.selection_cursor_to_viewport(:top)
+      when :screen_middle    then term.selection_cursor_to_viewport(:middle)
+      when :screen_bottom    then term.selection_cursor_to_viewport(:bottom)
+      when :word_forward      then term.selection_cursor_word_forward(big: false)
+      when :word_forward_big  then term.selection_cursor_word_forward(big: true)
+      when :word_end          then term.selection_cursor_word_end(big: false)
+      when :word_end_big      then term.selection_cursor_word_end(big: true)
+      when :word_backward     then term.selection_cursor_word_backward(big: false)
+      when :word_backward_big then term.selection_cursor_word_backward(big: true)
       end
       invalidate
     end

data/lib/muxr/input_handler.rb

@@ -48,8 +48,19 @@ module Muxr
       "k"    => :up,
       "0"    => :line_start,
       "$"    => :line_end,
+      "^"    => :line_first_nonblank,
       "g"    => :top,
       "G"    => :bottom,
+      "H"    => :screen_top,
+      "M"    => :screen_middle,
+      "L"    => :screen_bottom,
+      "w"    => :word_forward,
+      "W"    => :word_forward_big,
+      "e"    => :word_end,
+      "E"    => :word_end_big,
+      # `b` is vim word-back here; the tmux-style page-back alias lives on Ctrl-b.
+      "b"    => :word_backward,
+      "B"    => :word_backward_big,
       "\x04" => :half_down, # Ctrl-d
       "\x15" => :half_up,   # Ctrl-u
       "d"    => :half_down,
@@ -57,7 +68,6 @@ module Muxr
       "\x06" => :full_down, # Ctrl-f
       "\x02" => :full_up,   # Ctrl-b
       "f"    => :full_down,
-      "b"    => :full_up,
       " "    => :full_down
     }.freeze
 

data/lib/muxr/renderer.rb

@@ -264,8 +264,9 @@ module Muxr
       "  C-a Tab     cycle layout (tall → grid → monocle)",
       "  C-a Enter   promote focused pane to master",
       "  C-a ~       toggle drawer",
-      "  C-a [       enter scrollback (j/k d/u f/b g/G; v→cursor, q quits)",
-      "              in cursor mode: v char-select, C-v block-select, y yank",
+      "  C-a [       enter scrollback (j/k d/u f g/G C-b/C-f; v→cursor, q quits)",
+      "              cursor: v select, C-v block, y yank, q cancel",
+      "              motions: h/j/k/l 0/^/$ w/e/b W/E/B H/M/L g/G",
       "  C-a ]       paste internal copy buffer",
       "  C-a d       detach (server keeps running)",
       "  C-a q       kill session (asks y/n)",
@@ -439,6 +440,7 @@ module Muxr
       parts = ["0"]
       attrs = cell.attrs.to_i
       parts << "1" if (attrs & Terminal::BOLD) != 0
+      parts << "2" if (attrs & Terminal::DIM) != 0
       parts << "4" if (attrs & Terminal::UNDERLINE) != 0
       parts << "7" if (attrs & Terminal::REVERSE) != 0
       append_color(parts, cell.fg, true)

data/lib/muxr/terminal.rb

@@ -8,6 +8,7 @@ module Muxr
     BOLD      = 1
     UNDERLINE = 2
     REVERSE   = 4
+    DIM       = 8
 
     SCROLLBACK_MAX = 5000
 
@@ -183,6 +184,96 @@ module Muxr
       selection_cursor_to(timeline_size - 1, @cols - 1)
     end
 
+    def selection_cursor_to_first_non_blank
+      return unless @selection_cursor
+      tr = @selection_cursor[0]
+      selection_cursor_to(tr, first_non_blank_col(tr))
+    end
+
+    # Jump to top/middle/bottom of the visible viewport (vim H/M/L), landing
+    # on the first non-blank column of the destination line.
+    def selection_cursor_to_viewport(where)
+      return unless @selection_cursor
+      vr = case where
+           when :top    then 0
+           when :middle then @rows / 2
+           when :bottom then @rows - 1
+           end
+      return if vr.nil?
+      tr = timeline_row_for_visible(vr).clamp(0, timeline_size - 1)
+      selection_cursor_to(tr, first_non_blank_col(tr))
+    end
+
+    def selection_cursor_word_forward(big: false)
+      return unless @selection_cursor
+      tr, tc = @selection_cursor
+      prev_cls = char_class_at(tr, tc, big: big)
+      loop do
+        nxt = step_forward(tr, tc)
+        break unless nxt
+        ntr, ntc = nxt
+        cur_cls = char_class_at(ntr, ntc, big: big)
+        # Row boundaries act as whitespace breaks even when the row is fully
+        # packed (no trailing pad) — visually the user sees a new line.
+        effective_prev = (ntr != tr) ? :space : prev_cls
+        if effective_prev != cur_cls && cur_cls != :space
+          selection_cursor_to(ntr, ntc)
+          return
+        end
+        tr, tc = ntr, ntc
+        prev_cls = cur_cls
+      end
+      selection_cursor_to(timeline_size - 1, @cols - 1)
+    end
+
+    def selection_cursor_word_end(big: false)
+      return unless @selection_cursor
+      tr, tc = @selection_cursor
+      pos = step_forward(tr, tc)
+      return unless pos
+      tr, tc = pos
+      while char_class_at(tr, tc, big: big) == :space
+        pos = step_forward(tr, tc)
+        break unless pos
+        tr, tc = pos
+      end
+      return if char_class_at(tr, tc, big: big) == :space
+      cls = char_class_at(tr, tc, big: big)
+      loop do
+        pos = step_forward(tr, tc)
+        if pos.nil? || pos[0] != tr || char_class_at(pos[0], pos[1], big: big) != cls
+          selection_cursor_to(tr, tc)
+          return
+        end
+        tr, tc = pos
+      end
+    end
+
+    def selection_cursor_word_backward(big: false)
+      return unless @selection_cursor
+      tr, tc = @selection_cursor
+      pos = step_backward(tr, tc)
+      return unless pos
+      tr, tc = pos
+      while char_class_at(tr, tc, big: big) == :space
+        pos = step_backward(tr, tc)
+        unless pos
+          selection_cursor_to(tr, tc)
+          return
+        end
+        tr, tc = pos
+      end
+      cls = char_class_at(tr, tc, big: big)
+      loop do
+        pos = step_backward(tr, tc)
+        if pos.nil? || pos[0] != tr || char_class_at(pos[0], pos[1], big: big) != cls
+          selection_cursor_to(tr, tc)
+          return
+        end
+        tr, tc = pos
+      end
+    end
+
     def clear_selection
       return unless @selection_anchor
       @selection_anchor = nil
@@ -594,6 +685,44 @@ module Muxr
       @scrollback.size - @view_offset + r
     end
 
+    def first_non_blank_col(tr)
+      row = timeline_row(tr)
+      return 0 unless row
+      @cols.times do |c|
+        ch = row[c]&.char
+        return c if ch && ch != " " && ch != "\t"
+      end
+      0
+    end
+
+    def char_class_at(tr, tc, big:)
+      row = timeline_row(tr)
+      classify_char(row && row[tc] && row[tc].char, big: big)
+    end
+
+    # vim "word" = run of \w (alnum + _); "WORD" = any run of non-whitespace.
+    def classify_char(ch, big:)
+      return :space if ch.nil? || ch == " " || ch == "\t" || ch == ""
+      return :word if big
+      ch.match?(/\A\w\z/) ? :word : :punct
+    end
+
+    def step_forward(tr, tc)
+      if tc + 1 < @cols
+        [tr, tc + 1]
+      elsif tr + 1 < timeline_size
+        [tr + 1, 0]
+      end
+    end
+
+    def step_backward(tr, tc)
+      if tc > 0
+        [tr, tc - 1]
+      elsif tr > 0
+        [tr - 1, @cols - 1]
+      end
+    end
+
     def ordered_selection
       a = @selection_anchor
       b = @selection_cursor
@@ -719,9 +848,10 @@ module Muxr
           @bg = nil
           @attrs = 0
         when 1 then @attrs |= BOLD
+        when 2 then @attrs |= DIM
         when 4 then @attrs |= UNDERLINE
         when 7 then @attrs |= REVERSE
-        when 22 then @attrs &= ~BOLD
+        when 22 then @attrs &= ~(BOLD | DIM)
         when 24 then @attrs &= ~UNDERLINE
         when 27 then @attrs &= ~REVERSE
         when 30..37 then @fg = p - 30

data/lib/muxr/version.rb

@@ -1,3 +1,3 @@
 module Muxr
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muxr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Roel Bondoc