muxr 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16281336febc64c008a43dcd0419fb9ea796dc49f9a36b9ac16f2e20373f302e
-  data.tar.gz: d28305f5833ecd082ab850e981a074b1c936d0a06829fbfa1be8814d67ed4faa
+  metadata.gz: 5b49dc8c773efbfdca08e50511ca4c66b7ef9026d5873e7f0d0f6f9adb24f946
+  data.tar.gz: 1d9db1a9dd14bfeb6e84646c91ff2c0804bff406d9e7716bf59f6b0dd2a4cbba
 SHA512:
-  metadata.gz: a31cf649a48541e25b417ab92f9ec14cda5d64acfd0827532792d181effc6b051d5c97234f6fe734ffc97c951819caf857da43a2902ec7068d4f0a5b798c1e40
-  data.tar.gz: 22b1e5990231d697960c9fe8ef7e7d8c4a6502eb8305497dc5759b8cd5dab785f38f21be92ab835a69afd194b74f1eaf45b184332b64cb5c1d7e97545e937ba1
+  metadata.gz: 3147be5a9ab44a49eb9df20d69ea39a91218f8df5d182de13f141f1dcac2cc3f43ddf157dc1ef8f6088f1852aeeef130ce3b835476f317e2a41b8f331ac5b068
+  data.tar.gz: 847059de7300b33d2b9c84ab46d5505ca15b70211a9f1588418c8112ba4c20ac495f7964a7ea181e2246a3e9542acb26df149bad0097164332f8eb629cfc1a19

data/CHANGELOG.md

@@ -6,6 +6,38 @@ follow [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.1.10] - 2026-05-29
+
+### Added
+- Six new layouts join `tall`, `grid`, and `monocle`:
+  - **`wide`** (`w`) — master on top, slaves split across the bottom.
+  - **`columns`** (`|`) — equal-width, full-height vertical strips.
+  - **`rows`** (`-`) — equal-height, full-width horizontal strips.
+  - **`spiral`** (`f`) — Fibonacci spiral winding inward, each pane half
+    the size of the last.
+  - **`centered`** (`e`) — master in a centred column with slaves dealt
+    to both sides.
+  - **`stack`** (`S`) — accordion: the focused pane expands while the
+    others collapse to title slivers.
+  The `:layout` command resolves any unambiguous name prefix across all
+  nine layouts; `C-a Tab` / `Tab` cycles through them in order. README
+  screenshots cover every layout.
+
+## [0.1.9] - 2026-05-29
+
+### Added
+- `:layout` accepts short-form prefixes — `:layout t` / `g` / `m` map to
+  tall / grid / monocle via prefix matching. Full names still work; an
+  ambiguous prefix flashes the candidate layouts.
+- README screenshots are now generated by [VHS](https://github.com/charmbracelet/vhs)
+  tapes under `docs/screenshots/tapes/`, regenerated with a single
+  `regenerate.sh` run. New captures cover scrollback `/` search and
+  movable-cursor visual selection.
+
+### Documentation
+- Documented that wrapped plain-text URLs are stamped with OSC 8
+  hyperlink ids (the 0.1.8 feature) in the README architecture section.
+
 ## [0.1.8] - 2026-05-22
 
 ### Added

data/README.md

@@ -33,17 +33,49 @@ with the border color — tracks the current [input mode](#modes).
 
 ## Screenshots
 
-The three built-in layouts (pick directly with `t`/`g`/`m` in normal mode, or cycle with `Tab` / `C-a Tab`):
+The built-in layouts (pick directly with the keys below in normal mode, or cycle with `Tab` / `C-a Tab`):
+
+| Layout | Key | Geometry |
+|--------|-----|----------|
+| `tall`     | `t` | master on the left, slaves stacked on the right |
+| `wide`     | `w` | master on top, slaves split across the bottom |
+| `columns`  | `\|` | equal-width full-height vertical strips |
+| `rows`     | `-` | equal-height full-width horizontal strips |
+| `grid`     | `g` | roughly-square even tiling |
+| `spiral`   | `f` | Fibonacci spiral winding inward (each pane half the last) |
+| `centered` | `e` | master in a centred column, slaves dealt to both sides |
+| `stack`    | `S` | accordion — focused pane expands, others collapse to title slivers |
+| `monocle`  | `m` | focused pane fullscreen |
 
 <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>
+    <td align="center"><strong>wide</strong><br/>master on top, slaves below</td>
+    <td align="center"><strong>columns</strong><br/>equal-width strips</td>
   </tr>
   <tr>
     <td><img src="docs/screenshots/01-layout-tall.png" alt="tall layout"></td>
+    <td><img src="docs/screenshots/05-layout-wide.png" alt="wide layout"></td>
+    <td><img src="docs/screenshots/06-layout-columns.png" alt="columns layout"></td>
+  </tr>
+  <tr>
+    <td align="center"><strong>rows</strong><br/>equal-height strips</td>
+    <td align="center"><strong>grid</strong><br/>even tiling</td>
+    <td align="center"><strong>spiral</strong><br/>Fibonacci spiral</td>
+  </tr>
+  <tr>
+    <td><img src="docs/screenshots/07-layout-rows.png" alt="rows layout"></td>
     <td><img src="docs/screenshots/02-layout-grid.png" alt="grid layout"></td>
+    <td><img src="docs/screenshots/08-layout-spiral.png" alt="spiral layout"></td>
+  </tr>
+  <tr>
+    <td align="center"><strong>centered</strong><br/>master flanked by slaves</td>
+    <td align="center"><strong>stack</strong><br/>accordion of title slivers</td>
+    <td align="center"><strong>monocle</strong><br/>focused pane fullscreen</td>
+  </tr>
+  <tr>
+    <td><img src="docs/screenshots/09-layout-centered.png" alt="centered layout"></td>
+    <td><img src="docs/screenshots/10-layout-stack.png" alt="stack layout"></td>
     <td><img src="docs/screenshots/03-layout-monocle.png" alt="monocle layout"></td>
   </tr>
 </table>
@@ -52,6 +84,17 @@ The Quake-style drawer overlay (`~` in normal mode, `C-a ~` in passthrough):
 
 ![drawer overlay](docs/screenshots/04-drawer.png)
 
+Scrollback / copy-mode (`s`) with `/` search — matches highlight in
+yellow and the focused pane border turns orange:
+
+![scrollback search](docs/screenshots/05-scrollback-search.png)
+
+Movable-cursor visual selection (`v` inside scrollback) — the border
+turns magenta and the swept region is highlighted, ready to yank with
+`y`:
+
+![visual selection](docs/screenshots/06-selection.png)
+
 ## Install / run
 
 ```bash
@@ -89,7 +132,7 @@ muxr has two top-level input modes, modeled on vim:
 
 - **Normal** (default at startup) — single keys act on the multiplexer.
   `hjkl` moves focus between panes, `HJKL` moves the focused pane
-  itself, `c`/`x` create/close panes, `t`/`g`/`m` set the layout, etc.
+  itself, `c`/`x` create/close panes, `t`/`w`/`g`/`m` (and `|`/`-`/`f`/`e`/`S`) set the layout, etc.
   No prefix needed.
 - **Passthrough** (entered with `i`) — every keystroke is forwarded to
   the focused pane, exactly like a regular terminal. muxr commands are
@@ -113,7 +156,8 @@ regardless of mode.
 | `H` / `J` / `K` / `L`| move focused pane left / down / up / right          |
 | `i`                  | drop into passthrough mode                          |
 | `c` / `x`            | new / close focused pane (close asks `y/n`)         |
-| `t` / `g` / `m`      | layout: tall / grid / monocle                       |
+| `t` / `w` / `g` / `m`| layout: tall / wide / grid / monocle                |
+| `\|` / `-` / `f` / `e` / `S` | layout: columns / rows / spiral / centered / stack |
 | `Tab` / `Enter`      | cycle layout / promote focused to master            |
 | `a` / `1` … `9`      | toggle last pane / jump to pane by number           |
 | `s`                  | enter scrollback / copy-mode                        |
@@ -144,7 +188,7 @@ the move falls back to linear next/prev shuffling.
 | `C-a a`        | toggle last (previously focused) pane                   |
 | `C-a 1` … `9`  | jump to pane by its label                               |
 | `C-a x`        | close focused pane (asks `y/n`; hides drawer with no prompt) |
-| `C-a Tab`      | cycle layout (`tall` → `grid` → `monocle`)              |
+| `C-a Tab`      | cycle layout (`tall` → `wide` → `columns` → `rows` → `grid` → `spiral` → `centered` → `stack` → `monocle`) |
 | `C-a Enter`    | promote focused pane to master                          |
 | `C-a ~`        | toggle drawer (shell)                                   |
 | `C-a C`        | toggle Claude Code drawer (MCP-aware)                   |
@@ -206,7 +250,10 @@ focused pane.
 ## Commands (typed after `:` in normal mode, or `C-a :` in passthrough)
 
 ```
-layout {tall|grid|monocle}     # also: layout (no arg) → cycle
+layout {tall|wide|columns|rows|grid|spiral|centered|stack|monocle}
+                               # any unambiguous name prefix works (t, w, r, g, m, …);
+                               # ambiguous ones (c → columns/centered, s → spiral/stack)
+                               # flash the candidates. layout (no arg) → cycle
 drawer {toggle|show|hide|reset}
 claude                         # toggle the Claude Code drawer
 private                        # toggle private flag on focused pane
@@ -324,7 +371,11 @@ The per-pane `Terminal` is a real VT100 emulator (cursor movement, SGR
 including 256-color/truecolor and underline subparameters, erase/insert/
 delete, autowrap, scroll regions). Scrollback is composited into the
 visible grid through a view-offset that auto-tracks new rows while
-scrolled back, so reviewed content stays frozen.
+scrolled back, so reviewed content stays frozen. Plain-text `http`/
+`https`/`ftp` URLs that wrap across rows are re-stamped with matching
+OSC 8 hyperlink ids after each feed, so terminals like Ghostty, iTerm2,
+kitty, and WezTerm merge the wrapped halves back into one clickable
+link (program-emitted OSC 8 payloads are left untouched).
 
 ## Session persistence
 
@@ -390,6 +441,22 @@ On-disk layout:
  └─ logs/<name>.log             server stdout/stderr
 ```
 
+### Regenerating the README screenshots
+
+The PNGs under `docs/screenshots/` are produced by [`vhs`](https://github.com/charmbracelet/vhs)
+driving muxr itself — one `.tape` file per screenshot under
+`docs/screenshots/tapes/`. After a UI change, refresh them with:
+
+```bash
+brew install vhs                       # one-time
+docs/screenshots/tapes/regenerate.sh   # renders all six
+```
+
+Each tape spawns a throwaway `shot` session, populates one or more panes
+with `ls`/`git log`/`wc` output, drives the feature being shown (layout,
+drawer, scrollback search, selection), and writes a single PNG via
+`Screenshot`. Tweak the tape if the keybindings or status bar change.
+
 ## Contributing
 
 Contributions are welcome from anyone, with one requirement: **the code

data/lib/muxr/command_dispatcher.rb

@@ -45,10 +45,12 @@ module Muxr
         @app.cycle_layout
         return
       end
-      sym = name.to_sym
-      if Window::LAYOUTS.include?(sym)
-        @app.session.window.set_layout(sym)
+      matches = Window::LAYOUTS.select { |l| l.to_s.start_with?(name) }
+      if matches.length == 1
+        @app.session.window.set_layout(matches.first)
         @app.invalidate
+      elsif matches.length > 1
+        @app.flash("ambiguous layout: #{name} (#{matches.join(", ")})")
       else
         @app.flash("unknown layout: #{name}")
       end

data/lib/muxr/input_handler.rb

@@ -31,8 +31,14 @@ module Muxr
       "c"  => :new_pane,
       "x"  => :request_close,
       "t"  => [:set_layout, :tall],
+      "w"  => [:set_layout, :wide],
       "g"  => [:set_layout, :grid],
       "m"  => [:set_layout, :monocle],
+      "|"  => [:set_layout, :columns],
+      "-"  => [:set_layout, :rows],
+      "f"  => [:set_layout, :spiral],
+      "e"  => [:set_layout, :centered],
+      "S"  => [:set_layout, :stack],
       "\t" => :cycle_layout,
       "\r" => :promote_master,
       "\n" => :promote_master,

data/lib/muxr/layout_manager.rb

@@ -10,7 +10,7 @@ module Muxr
       end
     end
 
-    LAYOUTS = %i[tall grid monocle].freeze
+    LAYOUTS = %i[tall wide columns rows grid spiral centered stack monocle].freeze
 
     module_function
 
@@ -19,9 +19,15 @@ module Muxr
       master_index = master_index.clamp(0, count - 1)
       focused_index = focused_index.clamp(0, count - 1)
       case layout
-      when :tall    then tall(count, area, master_index)
-      when :grid    then grid(count, area)
-      when :monocle then monocle(count, area, focused_index)
+      when :tall     then tall(count, area, master_index)
+      when :wide     then wide(count, area, master_index)
+      when :columns  then columns(count, area)
+      when :rows     then rows(count, area)
+      when :grid     then grid(count, area)
+      when :spiral   then spiral(count, area)
+      when :centered then centered(count, area, master_index)
+      when :stack    then stack(count, area, focused_index)
+      when :monocle  then monocle(count, area, focused_index)
       else
         raise ArgumentError, "Unknown layout: #{layout.inspect}"
       end
@@ -52,6 +58,153 @@ module Muxr
       rects
     end
 
+    # The transpose of `tall`: master pane spans the full width across the top
+    # half; remaining panes sit side-by-side in the bottom half, dividing the
+    # remaining width evenly.
+    def wide(count, area, master_index = 0)
+      master_index = master_index.clamp(0, count - 1)
+      return [Rect.new(area.x, area.y, area.w, area.h)] if count == 1
+
+      master_h = [area.h / 2, 1].max
+      stack_h  = [area.h - master_h, 1].max
+      others   = (0...count).to_a - [master_index]
+      slave_count = others.length
+      base_w = area.w / slave_count
+      remainder = area.w - base_w * slave_count
+
+      rects = Array.new(count)
+      rects[master_index] = Rect.new(area.x, area.y, area.w, master_h)
+
+      x = area.x
+      others.each_with_index do |idx, i|
+        w = base_w + (i < remainder ? 1 : 0)
+        rects[idx] = Rect.new(x, area.y + master_h, w, stack_h)
+        x += w
+      end
+      rects
+    end
+
+    # Equal-width, full-height vertical strips, side by side. No master.
+    def columns(count, area)
+      base_w = area.w / count
+      rem    = area.w - base_w * count
+      rects  = []
+      x = area.x
+      count.times do |i|
+        w = base_w + (i < rem ? 1 : 0)
+        rects << Rect.new(x, area.y, w, area.h)
+        x += w
+      end
+      rects
+    end
+
+    # Equal-height, full-width horizontal strips, stacked. The dual of columns.
+    def rows(count, area)
+      base_h = area.h / count
+      rem    = area.h - base_h * count
+      rects  = []
+      y = area.y
+      count.times do |i|
+        h = base_h + (i < rem ? 1 : 0)
+        rects << Rect.new(area.x, y, area.w, h)
+        y += h
+      end
+      rects
+    end
+
+    # Fibonacci spiral: each pane takes half of the remaining region, splitting
+    # vertically then horizontally in alternation, so panes wind inward toward
+    # the bottom-right. The last pane fills whatever is left.
+    def spiral(count, area)
+      x, y, w, h = area.x, area.y, area.w, area.h
+      rects = []
+      count.times do |i|
+        if i == count - 1
+          rects << Rect.new(x, y, w, h)
+        elsif i.even?
+          left = [w / 2, 1].max
+          rects << Rect.new(x, y, left, h)
+          x += left
+          w = [w - left, 1].max
+        else
+          top = [h / 2, 1].max
+          rects << Rect.new(x, y, w, top)
+          y += top
+          h = [h - top, 1].max
+        end
+      end
+      rects
+    end
+
+    # Three-column master: master occupies the centre column full-height; the
+    # remaining panes are dealt alternately to a left and a right column and
+    # stacked within each. With a single slave there is no symmetry to keep, so
+    # it falls back to a simple master/slave vertical split (like `tall`).
+    def centered(count, area, master_index = 0)
+      master_index = master_index.clamp(0, count - 1)
+      return [Rect.new(area.x, area.y, area.w, area.h)] if count == 1
+
+      others = (0...count).to_a - [master_index]
+      rects  = Array.new(count)
+
+      if others.length == 1
+        master_w = [area.w / 2, 1].max
+        rects[master_index] = Rect.new(area.x, area.y, master_w, area.h)
+        rects[others[0]] = Rect.new(area.x + master_w, area.y, [area.w - master_w, 1].max, area.h)
+        return rects
+      end
+
+      master_w = [area.w / 2, 1].max
+      side_w   = area.w - master_w
+      left_w   = [side_w / 2, 1].max
+      right_w  = [side_w - left_w, 1].max
+
+      rects[master_index] = Rect.new(area.x + left_w, area.y, master_w, area.h)
+      left  = others.select.with_index { |_, i| i.even? }
+      right = others.select.with_index { |_, i| i.odd? }
+      stack_column(rects, left,  area.x, area.y, left_w, area.h)
+      stack_column(rects, right, area.x + left_w + master_w, area.y, right_w, area.h)
+      rects
+    end
+
+    # Accordion: the focused pane expands to fill the leftover height while the
+    # others collapse to short "title sliver" rows, all stacked vertically.
+    # Like monocle but the other panes stay visible (and spatially reachable).
+    def stack(count, area, focused_index = 0)
+      return [Rect.new(area.x, area.y, area.w, area.h)] if count == 1
+      focused_index = focused_index.clamp(0, count - 1)
+
+      others = count - 1
+      # Sliver is 3 rows so draw_box can still render the title; shrink it only
+      # when the terminal is too short to give the focused pane its own 3 rows.
+      sliver = [3, [area.h - 3, 0].max / others].min
+      sliver = [sliver, 1].max
+      focus_h = area.h - sliver * others
+
+      rects = Array.new(count)
+      y = area.y
+      count.times do |i|
+        h = (i == focused_index) ? focus_h : sliver
+        rects[i] = Rect.new(area.x, y, area.w, h)
+        y += h
+      end
+      rects
+    end
+
+    # Stack the given pane indices vertically within a single column, dividing
+    # the height evenly (remainder to the topmost panes). Used by `centered`.
+    def stack_column(rects, indices, x, y, w, total_h)
+      return if indices.empty?
+      base_h = total_h / indices.length
+      rem    = total_h - base_h * indices.length
+      cy = y
+      indices.each_with_index do |idx, i|
+        h = base_h + (i < rem ? 1 : 0)
+        rects[idx] = Rect.new(x, cy, w, h)
+        cy += h
+      end
+    end
+
     # Roughly square grid. Each row stretches its panes to fill the full width
     # so an underfull bottom row doesn't leave gaps.
     def grid(count, area)

data/lib/muxr/renderer.rb

@@ -391,7 +391,8 @@ module Muxr
       "  H / J / K / L   move pane left / down / up / right",
       "  i               drop into passthrough mode",
       "  c / x           new / close pane (close asks y/n)",
-      "  t / g / m       layout: tall / grid / monocle",
+      "  t / w / g / m   layout: tall / wide / grid / monocle",
+      "  | - f e S       layout: columns / rows / spiral / centered / stack",
       "  Tab / Enter     cycle layout / promote to master",
       "  a / 1..9        last pane / jump by number",
       "  s               enter scrollback",
@@ -401,7 +402,7 @@ module Muxr
       "",
       "PASSTHROUGH mode (keys reach the focused pane; prefix is Ctrl-a)",
       "  C-a Esc         return to normal mode",
-      "  C-a c x t g m   same as normal-mode bindings",
+      "  C-a c x t w g m same as normal-mode bindings",
       "  C-a Tab Enter   cycle layout / promote master",
       "  C-a n / p / a   next / prev / last pane",
       "  C-a [ ]         scrollback / paste buffer",
@@ -413,7 +414,8 @@ module Muxr
       "  cursor: h/j/k/l 0/^/$ w/e/b W/E/B H/M/L g/G",
       "          v select, C-v block, y/Enter yank, q/Esc cancel",
       "",
-      "Commands: layout {tall|grid|monocle}, drawer {toggle|show|hide|reset},",
+      "Commands: layout {tall|wide|columns|rows|grid|spiral|centered|stack|monocle},",
+      "          drawer {toggle|show|hide|reset},",
       "          claude, save, restore, sessions, quit, new, close, next, prev",
       "",
       "press any key to dismiss"

data/lib/muxr/version.rb

@@ -1,3 +1,3 @@
 module Muxr
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

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