@jx0/jmux 0.3.0 → 0.3.2

package/README.md

@@ -1,142 +1,95 @@
+<div align="center">
+
 # jmux
 
-A persistent session sidebar for tmux. See every project at a glance, switch instantly, never lose context.
+**The terminal workspace for agentic development.**
 
-![jmux sidebar with grouped sessions alongside vim and server logs](docs/screenshots/hero.png)
+A tmux environment built for running coding agents in parallel — with a persistent sidebar that shows every session, what's running, and what needs your attention.
 
----
+[![npm](https://img.shields.io/npm/v/@jx0/jmux)](https://www.npmjs.com/package/@jx0/jmux)
+[![license](https://img.shields.io/github/license/jarredkenny/jmux)](LICENSE)
 
-## The Problem
+![jmux sidebar with grouped sessions alongside vim and server logs](docs/screenshots/hero.png)
 
-You have 30+ tmux sessions. Each one is a project, a context, a train of thought. But tmux gives you a flat list and a status bar that shows one session name. To switch, you `prefix-s`, scan a wall of text, find the one you want, and hope you remember which window you were in.
+</div>
 
-You lose context constantly. You forget what's running where. You can't see at a glance which sessions have new output or which ones need attention.
+## Install
 
-## The Solution
+```bash
+bun install -g @jx0/jmux
+jmux
+```
 
-jmux wraps tmux with a persistent sidebar that shows all your sessions, all the time. It works with your existing `~/.tmux.conf` — your plugins, your colors, your keybindings — and layers a sidebar on top.
+Requires [Bun](https://bun.sh) 1.2+, [tmux](https://github.com/tmux/tmux) 3.2+, [fzf](https://github.com/junegunn/fzf), and optionally [git](https://git-scm.com/) for branch display.
 
-**What you get:**
-- Every session visible at all times with git branch and window count
-- Sessions grouped by project directory — related work stays together
-- Instant switching with `Ctrl-Shift-Up/Down` — no prefix, no menu, no delay
-- Activity indicators (green dot) and attention flags (orange `!`) for agentic workflows
-- Mouse click to switch sessions
-- New session modal with fuzzy directory picker
-- Bring your own `~/.tmux.conf` — your plugins and keybindings just work
+---
 
-![jmux sidebar alongside vim with split panes and a dev server](docs/screenshots/blog.png)
+## Why
 
-## How It Works
+tmux sessions are invisible. You have 30 of them, but the status bar shows one name. To switch, you `prefix-s`, scan a wall of text, and hope you remember what's where.
 
-jmux owns the terminal. It spawns tmux in a PTY, feeds the output through a headless terminal emulator ([xterm.js](https://xtermjs.org/)), and composites a 24-column sidebar alongside the tmux rendering. A separate tmux control mode connection provides real-time session metadata via push notifications.
+jmux fixes this with a persistent sidebar that shows every session, all the time.
 
-jmux sources your `~/.tmux.conf` first, then layers its own defaults and the few settings the sidebar requires. Your existing setup carries over — jmux just adds the sidebar.
+## Features
 
-```
-┌─ jmux sidebar ──┬─ your normal tmux ──────────────────────┐
-│                  │                                         │
-│  jmux            │  $ vim src/server.ts                    │
-│ ──────────────── │  ...                                    │
-│ Code/work        │                                         │
-│ ▎ api-server  3w │                                         │
-│              main│                                         │
-│                  │                                         │
-│   dashboard   1w │                                         │
-│            feat/x│                                         │
-│                  │                                         │
-│ Code/personal    │                                         │
-│ ● blog        1w │                                         │
-│                  │                                         │
-│   dotfiles    2w │                                         │
-│                  ├─────────────────────────────────────────┤
-│                  │  1:vim  2:zsh  3:bun                    │
-└──────────────────┴─────────────────────────────────────────┘
-```
+### Session Sidebar
 
-### Sidebar Features
+Every session visible at a glance — name, window count, git branch. Sessions sharing a parent directory are automatically grouped under a header.
 
-**Session grouping** — Sessions that share a parent directory are automatically grouped under a header. `~/Code/work/api` and `~/Code/work/web` group under `Code/work`. Solo sessions render ungrouped.
+- Green `▎` left marker on the active session
+- Green `●` dot for sessions with new output
+- Orange `!` flag for attention (set programmatically)
 
-**Two-line entries** — Each session shows its name and window count on the first line, git branch on the second. Grouped sessions inherit directory context from the group header. Ungrouped sessions show their directory path.
+### Instant Switching
 
-**Visual indicators:**
-- Green `▎` left marker — active session
-- Green `●` dot — new output since you last viewed that session
-- Orange `!` flag — attention needed (set programmatically)
+`Ctrl-Shift-Up/Down` moves between sessions with zero delay. No prefix key, no menu, no mode to enter. Or just click a session in the sidebar.
 
-## Installation
+### New Session Modal
 
-```bash
-# Install globally
-bun install -g @jx0/jmux
+`Ctrl-a n` opens a two-step fzf flow: fuzzy-search your git repos for a directory, then name the session. Pre-filled with the directory basename.
 
-# Run
-jmux
-```
-
-### Requirements
+### Window Picker
 
-- [Bun](https://bun.sh) 1.2+
-- [tmux](https://github.com/tmux/tmux) 3.2+
-- [fzf](https://github.com/junegunn/fzf) (for new session modal)
-- [git](https://git-scm.com/) (optional, for branch display)
+`Ctrl-a j` opens a full-height fzf popup with every window in the current session. Type to filter, Enter to switch.
 
-### Usage
+![fzf window picker popup](docs/screenshots/window-picker.png)
 
-```bash
-# Start jmux (creates or attaches to default session)
-jmux
+### Bring Your Own Config
 
-# Start with a named session
-jmux my-project
+jmux works with your existing `~/.tmux.conf`. Your plugins, theme, prefix key, and custom bindings carry over — jmux applies its defaults first, then your config overrides them. Only a small set of core settings the sidebar needs are enforced.
 
-# Use a separate tmux server (won't touch your existing sessions)
-jmux -L work
-```
+### Claude Code Integration
 
-### From Source
+Built for agentic workflows. Run Claude Code in multiple sessions and get notified when each one finishes.
 
 ```bash
-git clone https://github.com/jarredkenny/jmux.git
-cd jmux
-bun install
-bun run bin/jmux
+jmux --install-agent-hooks
 ```
 
-## New Session Modal
-
-Press `Ctrl-a n` to create a new session. The modal walks you through two steps:
+One command adds a hook to `~/.claude/settings.json`. When Claude finishes a response, the orange `!` appears on that session. Switch to it, review the work, move on. See [docs/claude-code-integration.md](docs/claude-code-integration.md) for details.
 
-1. **Pick a directory** — fuzzy search over all git repos found under `~/Code`, `~/Projects`, `~/src`, `~/work`, and `~/dev`. Start typing to narrow down instantly.
-
-2. **Name the session** — pre-filled with the directory basename. Edit or accept with Enter.
-
-The session is created in the selected directory and the sidebar updates immediately. The new session is auto-selected.
+---
 
 ## Keybindings
 
-### Session Navigation (always active)
+### Sessions
 
 | Key | Action |
 |-----|--------|
-| `Ctrl-Shift-Up` | Switch to previous session |
-| `Ctrl-Shift-Down` | Switch to next session |
-| `Ctrl-a n` | New session (directory picker + name) |
-| Click sidebar | Switch to that session |
+| `Ctrl-Shift-Up/Down` | Switch to prev/next session |
+| `Ctrl-a n` | New session |
+| `Ctrl-a r` | Rename session |
+| `Ctrl-a m` | Move window to another session |
+| Click sidebar | Switch to session |
 
 ### Windows
 
 | Key | Action |
 |-----|--------|
-| `Ctrl-a c` | New window (opens in `~`) |
 | `Ctrl-a j` | fzf window picker |
-| `Ctrl-Right` / `Ctrl-Left` | Next / previous window |
-| `Ctrl-Shift-Right` / `Ctrl-Shift-Left` | Reorder windows |
-
-`Ctrl-a j` opens a full-height fzf popup on the left side of the screen with all windows in the current session. Type to fuzzy search, Enter to switch.
-
-![fzf window picker popup](docs/screenshots/window-picker.png)
+| `Ctrl-a c` | New window |
+| `Ctrl-Right/Left` | Next/prev window |
+| `Ctrl-Shift-Right/Left` | Reorder windows |
 
 ### Panes
 
@@ -146,79 +99,49 @@ The session is created in the selected directory and the sidebar updates immedia
 | `Ctrl-a -` | Split vertical |
 | `Shift-arrows` | Navigate panes |
 | `Ctrl-a arrows` | Resize panes |
-| `Ctrl-a P` | Toggle pane border titles |
 
 ### Utilities
 
 | Key | Action |
 |-----|--------|
-| `Ctrl-a k` | Clear pane screen and scrollback |
-| `Ctrl-a y` | Copy entire pane to clipboard |
-
-## Claude Code Integration
-
-jmux is built for agentic workflows. When you have Claude Code running in multiple sessions, you need to know which ones need your attention.
-
-### One-Command Setup
-
-```bash
-jmux --install-agent-hooks
-```
-
-This adds a hook to `~/.claude/settings.json` that sets the attention flag whenever Claude Code finishes a response. The orange `!` appears in your sidebar so you know which session to check.
-
-### Manual Setup
-
-Set an attention flag on any session:
-
-```bash
-tmux set-option -t my-session @jmux-attention 1
-```
-
-jmux shows an orange `!` indicator. When you switch to that session, the flag clears automatically.
-
-### Workflow
+| `Ctrl-a k` | Clear pane + scrollback |
+| `Ctrl-a y` | Copy pane to clipboard |
+| `Ctrl-a P` | Toggle pane border titles |
 
-1. Start jmux
-2. Create sessions for each project (`Ctrl-a n`)
-3. Run Claude Code in each session on different tasks
-4. Work in one session while others run in the background
-5. Orange `!` flags appear when Claude finishes — switch instantly with `Ctrl-Shift-Down`
+---
 
 ## Configuration
 
-jmux loads config in three layers:
+Config loads in three layers:
 
 ```
 config/defaults.conf      ← jmux defaults (baseline)
 ~/.tmux.conf              ← your config (overrides defaults)
-config/core.conf          ← jmux requirements (always wins)
+config/core.conf          ← jmux core (always wins)
 ```
 
-jmux defaults are applied first as a baseline. Your `~/.tmux.conf` is sourced next — anything you set overrides the defaults. Finally, the core settings the sidebar depends on are applied last and cannot be overridden.
+Override any default in your `~/.tmux.conf` — prefix key, colors, keybindings, plugins. Only four core settings are enforced: `detach-on-destroy off`, `mouse on`, `prefix + n` binding, and empty `status-left`.
 
-**Core settings** (cannot be overridden):
-- `detach-on-destroy off` — switch to next session on kill, don't exit jmux
-- `mouse on` — required for sidebar clicks
-- `prefix + n` — new session modal
-- Empty `status-left` — session info is in the sidebar
+See [docs/configuration.md](docs/configuration.md) for the full guide.
 
-Everything else is yours to customize. See [docs/configuration.md](docs/configuration.md) for details.
+---
 
 ## Architecture
 
 ```
 Terminal (Ghostty, iTerm, etc.)
   └── jmux (owns the terminal surface)
-       ├── Sidebar (24 cols) ── session groups, indicators, navigation
-       ├── Border (1 col) ──── vertical separator
+       ├── Sidebar (24 cols) ── session groups, indicators
+       ├── Border (1 col)
        └── tmux PTY (remaining cols)
-            ├── PTY client ──── spawns tmux, feeds output through @xterm/headless
-            └── Control client ─ tmux -C for real-time session metadata
+            ├── PTY client ──── @xterm/headless for VT emulation
+            └── Control client ─ tmux -C for real-time metadata
 ```
 
-jmux is ~1500 lines of TypeScript. It has no opinions about what you run inside tmux.
+~1500 lines of TypeScript. No opinions about what you run inside tmux.
+
+---
 
 ## License
 
-MIT
+[MIT](LICENSE)

package/config/defaults.conf

@@ -59,6 +59,12 @@ set -g window-active-style 'fg=#b5bcc9'
 bind k send-keys -R \; clear-history \; display-message "Pane cleared"
 bind y run-shell "tmux capture-pane -pS - -E - | grep . | pbcopy" \; display-message "Copied pane to clipboard"
 
+# Move window to another session (C-a m)
+bind-key m display-popup -E -w 40% -h 50% -b heavy -S 'fg=#4f565d' "$JMUX_DIR/config/move-window.sh"
+
+# Rename session (C-a r)
+bind-key r display-popup -E -w 40% -h 8 -b heavy -S 'fg=#4f565d' "$JMUX_DIR/config/rename-session.sh"
+
 # Window switcher popup (C-a j) — jmux overrides this for sidebar mode,
 # but it's still available if sidebar mode changes
 bind-key j display-popup -E -x 0 -y 0 -w 30% -h 100% -b heavy -S 'fg=#4f565d' \

package/config/move-window.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+# jmux move window — pick a destination session
+# Called via: display-popup -E "move-window.sh"
+
+FZF_COLORS="border:#4f565d,header:#b5bcc9,prompt:#9fe8c3,label:#9fe8c3,pointer:#9fe8c3,fg:#6b7280,fg+:#b5bcc9,hl:#fbd4b8,hl+:#fbd4b8"
+
+CURRENT_WINDOW=$(tmux display-message -p '#W')
+CURRENT_SESSION=$(tmux display-message -p '#S')
+
+# List all sessions except the current one
+SESSIONS=$(tmux list-sessions -F '#S' | grep -v "^${CURRENT_SESSION}$")
+
+if [ -z "$SESSIONS" ]; then
+    echo "No other sessions to move to."
+    sleep 1
+    exit 0
+fi
+
+TARGET=$(echo "$SESSIONS" | fzf \
+    --height=100% \
+    --layout=reverse \
+    --border=rounded \
+    --border-label=" Move Window " \
+    --header="Moving: $CURRENT_WINDOW → ?" \
+    --header-first \
+    --prompt="Session: " \
+    --pointer="▸" \
+    --color="$FZF_COLORS")
+
+[ -z "$TARGET" ] && exit 0
+
+tmux move-window -t "$TARGET:"

package/config/new-session.sh

@@ -6,7 +6,7 @@ FZF_COLORS="border:#4f565d,header:#b5bcc9,prompt:#9fe8c3,label:#9fe8c3,pointer:#
 
 # ─── Step 1: Pick a directory ─────────────────────────────────────────
 
-# Build project list: find directories with .git (real projects)
+# Build project list: find directories with .git (dir or file — worktrees use a file)
 # Search common code directories, limit depth for speed
 PROJECT_DIRS=$(find \
     "$HOME/Code" \
@@ -14,8 +14,7 @@ PROJECT_DIRS=$(find \
     "$HOME/src" \
     "$HOME/work" \
     "$HOME/dev" \
-    2>/dev/null \
-    -maxdepth 3 -name ".git" -type d 2>/dev/null \
+    -maxdepth 4 -name ".git" 2>/dev/null \
     | sed 's|/\.git$||' \
     | sort -u)
 

package/config/rename-session.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# jmux rename session
+# Called via: display-popup -E "rename-session.sh"
+
+FZF_COLORS="border:#4f565d,header:#b5bcc9,prompt:#9fe8c3,label:#9fe8c3,pointer:#9fe8c3,fg:#6b7280,fg+:#b5bcc9,hl:#fbd4b8,hl+:#fbd4b8"
+
+CURRENT_NAME=$(tmux display-message -p '#S')
+
+NEW_NAME=$(echo "" | fzf --print-query \
+    --height=100% \
+    --layout=reverse \
+    --border=rounded \
+    --border-label=" Rename Session " \
+    --header="Current: $CURRENT_NAME" \
+    --header-first \
+    --prompt="Name: " \
+    --query="$CURRENT_NAME" \
+    --pointer="" \
+    --no-info \
+    --color="$FZF_COLORS" \
+    | head -1)
+
+[ -z "$NEW_NAME" ] && exit 0
+[ "$NEW_NAME" = "$CURRENT_NAME" ] && exit 0
+
+tmux rename-session "$NEW_NAME"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jx0/jmux",
-  "version": "0.3.0",
-  "description": "A persistent session sidebar for tmux",
+  "version": "0.3.2",
+  "description": "The terminal workspace for agentic development",
   "type": "module",
   "bin": {
     "jmux": "./bin/jmux"

package/src/__tests__/sidebar.test.ts

@@ -64,10 +64,10 @@ describe("Sidebar", () => {
       (_, i) => grid.cells[2][i].char,
     ).join("");
     expect(headerRow).toContain("Code/work");
-    // Row 3: first session in group "api"
+    // Row 3: spacer, Row 4: first session in group "api"
     const apiRow = Array.from(
       { length: SIDEBAR_WIDTH },
-      (_, i) => grid.cells[3][i].char,
+      (_, i) => grid.cells[4][i].char,
     ).join("");
     expect(apiRow).toContain("api");
   });
@@ -90,7 +90,7 @@ describe("Sidebar", () => {
     expect(row2).toContain("only-one");
   });
 
-  test("grouped sessions show branch but not directory on detail line", () => {
+  test("grouped sessions show branch on detail line", () => {
     const sidebar = new Sidebar(SIDEBAR_WIDTH, 30);
     sidebar.updateSessions(
       makeSessions([
@@ -107,11 +107,10 @@ describe("Sidebar", () => {
       ]),
     );
     const grid = sidebar.getGrid();
-    // Find the detail row for "api" (row after "api" name row)
-    // Row 2: group header, Row 3: api name, Row 4: api detail
+    // Row 2: group header, Row 3: spacer, Row 4: api name, Row 5: api detail
     const detailRow = Array.from(
       { length: SIDEBAR_WIDTH },
-      (_, i) => grid.cells[4][i].char,
+      (_, i) => grid.cells[5][i].char,
     ).join("");
     expect(detailRow).toContain("main");
     expect(detailRow).not.toContain("Code/work");
@@ -209,10 +208,12 @@ describe("Sidebar", () => {
 
     // Row 2: group header → null
     expect(sidebar.getSessionByRow(2)).toBeNull();
-    // Row 3: first session name row → api
-    expect(sidebar.getSessionByRow(3)?.name).toBe("api");
-    // Row 4: first session detail row → api
+    // Row 3: spacer → null
+    expect(sidebar.getSessionByRow(3)).toBeNull();
+    // Row 4: first session name row → api
     expect(sidebar.getSessionByRow(4)?.name).toBe("api");
+    // Row 5: first session detail row → api
+    expect(sidebar.getSessionByRow(5)?.name).toBe("api");
   });
 
   test("shows window count", () => {

package/src/main.ts

@@ -12,7 +12,7 @@ import { homedir } from "os";
 
 // --- CLI commands (run and exit before TUI) ---
 
-const VERSION = "0.3.0";
+const VERSION = "0.3.1";
 
 const HELP = `jmux — a persistent session sidebar for tmux
 
@@ -161,6 +161,7 @@ let ptyClientName: string | null = null;
 let sidebarShown = sidebarVisible;
 let currentSessions: SessionInfo[] = [];
 const lastViewedTimestamps = new Map<string, number>();
+const sessionDetailsCache = new Map<string, { directory?: string; gitBranch?: string }>();
 
 function switchByOffset(offset: number): void {
   const ids = sidebar.getDisplayOrderIds();
@@ -182,6 +183,7 @@ async function fetchSessions(): Promise<void> {
       .filter((l) => l.length > 0)
       .map((line) => {
         const [id, name, activity, attached, windows] = line.split(":");
+        const cached = sessionDetailsCache.get(id);
         return {
           id,
           name,
@@ -189,6 +191,8 @@ async function fetchSessions(): Promise<void> {
           attached: attached === "1",
           attention: false,
           windowCount: parseInt(windows, 10) || 1,
+          directory: cached?.directory,
+          gitBranch: cached?.gitBranch,
         };
       });
     currentSessions = sessions;
@@ -339,6 +343,7 @@ process.on("SIGWINCH", () => {
 control.onEvent((event: ControlEvent) => {
   switch (event.type) {
     case "sessions-changed":
+    case "session-renamed":
       fetchSessions();
       break;
     case "session-changed":
@@ -374,24 +379,33 @@ async function lookupSessionDetails(sessions: SessionInfo[]): Promise<void> {
   const home = process.env.HOME || "";
   for (const session of sessions) {
     try {
-      // Use control mode connection — respects -L socket and -f config
       const lines = await control.sendCommand(
         `display-message -t '${session.id}' -p '#{pane_current_path}'`,
       );
       const cwd = (lines[0] || "").trim();
       if (!cwd) continue;
-      session.directory = cwd.startsWith(home)
+      const directory = cwd.startsWith(home)
         ? "~" + cwd.slice(home.length)
         : cwd;
       const branch = await $`git -C ${cwd} branch --show-current`
         .text()
         .catch(() => "");
-      session.gitBranch = branch.trim() || undefined;
+      const gitBranch = branch.trim() || undefined;
+
+      // Write to persistent cache
+      sessionDetailsCache.set(session.id, { directory, gitBranch });
+      session.directory = directory;
+      session.gitBranch = gitBranch;
     } catch {
       // Session may not exist or no git repo
     }
   }
-  sidebar.updateSessions(sessions);
+  // Rebuild currentSessions with cached data
+  currentSessions = currentSessions.map((s) => {
+    const cached = sessionDetailsCache.get(s.id);
+    return cached ? { ...s, ...cached } : s;
+  });
+  sidebar.updateSessions(currentSessions);
   renderFrame();
 }
 

package/src/sidebar.ts

@@ -45,19 +45,38 @@ interface SessionGroup {
   sessionIndices: number[];
 }
 
-function getParentLabel(dir: string): string | null {
-  const lastSlash = dir.lastIndexOf("/");
-  if (lastSlash <= 0) return null;
-  const parent = dir.slice(0, lastSlash);
-  const segments = parent.split("/").filter((s) => s.length > 0);
-  if (segments.length === 0) return null;
-  if (segments[0] === "~" && segments.length === 1) return null;
-  return segments.slice(-2).join("/");
+function getGroupLabel(dir: string): string | null {
+  const segments = dir.split("/").filter((s) => s.length > 0);
+  // For ~/X/Y/... paths, group by X/Y (fixed depth)
+  // ~/Code/personal/jmux → "Code/personal"
+  // ~/Code/personal      → "Code/personal"
+  // ~/Code/tracktile/platform → "Code/tracktile"
+  if (segments[0] === "~") {
+    if (segments.length < 3) return null; // ~ or ~/Code — too shallow
+    return segments[1] + "/" + segments[2];
+  }
+  // Absolute paths: /X/Y/... → group by X/Y
+  if (segments.length < 2) return null;
+  return segments[0] + "/" + segments[1];
+}
+
+function getSubdirectory(dir: string, groupLabel: string): string | null {
+  // dir: "~/Code/personal/jmux", groupLabel: "Code/personal" → "jmux"
+  // dir: "~/Code/personal/jmux/sub", groupLabel: "Code/personal" → "jmux/sub"
+  const idx = dir.indexOf(groupLabel);
+  if (idx < 0) return null;
+  const rest = dir.slice(idx + groupLabel.length);
+  // rest is e.g. "/jmux" or "/jmux/sub/deep"
+  const trimmed = rest.replace(/^\/+/, "");
+  if (!trimmed) return null;
+  // For nested paths, just show the last directory name
+  const lastSlash = trimmed.lastIndexOf("/");
+  return lastSlash >= 0 ? trimmed.slice(lastSlash + 1) : trimmed;
 }
 
 type RenderItem =
   | { type: "group-header"; label: string }
-  | { type: "session"; sessionIndex: number; grouped: boolean }
+  | { type: "session"; sessionIndex: number; grouped: boolean; groupLabel?: string }
   | { type: "spacer" };
 
 function buildRenderPlan(sessions: SessionInfo[]): {
@@ -73,7 +92,7 @@ function buildRenderPlan(sessions: SessionInfo[]): {
       ungrouped.push(i);
       continue;
     }
-    const label = getParentLabel(dir);
+    const label = getGroupLabel(dir);
     if (!label) {
       ungrouped.push(i);
       continue;
@@ -109,8 +128,9 @@ function buildRenderPlan(sessions: SessionInfo[]): {
 
   for (const group of sortedGroups) {
     items.push({ type: "group-header", label: group.label });
+    items.push({ type: "spacer" });
     for (const idx of group.sessionIndices) {
-      items.push({ type: "session", sessionIndex: idx, grouped: true });
+      items.push({ type: "session", sessionIndex: idx, grouped: true, groupLabel: group.label });
       displayOrder.push(idx);
       items.push({ type: "spacer" });
     }
@@ -210,64 +230,104 @@ export class Sidebar {
       if (!session) continue;
 
       const nameRow = row;
-      const detailRow = row + 1;
       const isActive = session.id === this.activeSessionId;
       const hasActivity = this.activitySet.has(session.id);
 
-      // Map rows to session for click handling
-      this.rowToSessionIndex.set(nameRow, sessionIdx);
-      if (detailRow < this.height) {
-        this.rowToSessionIndex.set(detailRow, sessionIdx);
-      }
+      if (item.grouped) {
+        // Grouped: two rows — name + window count, then subdirectory + branch
+        const detailRow = row + 1;
 
-      // Active marker
-      if (isActive) {
-        writeString(grid, nameRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
+        this.rowToSessionIndex.set(nameRow, sessionIdx);
         if (detailRow < this.height) {
-          writeString(grid, detailRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
+          this.rowToSessionIndex.set(detailRow, sessionIdx);
         }
-      }
 
-      // Indicator
-      if (session.attention) {
-        writeString(grid, nameRow, 1, "!", ATTENTION_ATTRS);
-      } else if (hasActivity) {
-        writeString(grid, nameRow, 1, "\u25CF", ACTIVITY_ATTRS);
-      }
+        if (isActive) {
+          writeString(grid, nameRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
+          if (detailRow < this.height) {
+            writeString(grid, detailRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
+          }
+        }
 
-      // Window count right-aligned
-      const windowCountStr = `${session.windowCount}w`;
-      const windowCountCol = this.width - windowCountStr.length - 1;
+        if (session.attention) {
+          writeString(grid, nameRow, 1, "!", ATTENTION_ATTRS);
+        } else if (hasActivity) {
+          writeString(grid, nameRow, 1, "\u25CF", ACTIVITY_ATTRS);
+        }
 
-      // Session name
-      const nameStart = 3;
-      const nameMaxLen = windowCountCol - 1 - nameStart;
-      let displayName = session.name;
-      if (displayName.length > nameMaxLen) {
-        displayName = displayName.slice(0, nameMaxLen - 1) + "\u2026";
-      }
+        const windowCountStr = `${session.windowCount}w`;
+        const windowCountCol = this.width - windowCountStr.length - 1;
+        const nameStart = 3;
+        const nameMaxLen = windowCountCol - 1 - nameStart;
+        let displayName = session.name;
+        if (displayName.length > nameMaxLen) {
+          displayName = displayName.slice(0, nameMaxLen - 1) + "\u2026";
+        }
 
-      const nameAttrs: CellAttrs = isActive
-        ? { ...ACTIVE_NAME_ATTRS }
-        : { ...INACTIVE_NAME_ATTRS };
-      writeString(grid, nameRow, nameStart, displayName, nameAttrs);
+        const nameAttrs: CellAttrs = isActive
+          ? { ...ACTIVE_NAME_ATTRS }
+          : { ...INACTIVE_NAME_ATTRS };
+        writeString(grid, nameRow, nameStart, displayName, nameAttrs);
 
-      if (windowCountCol > nameStart) {
-        writeString(grid, nameRow, windowCountCol, windowCountStr, DIM_ATTRS);
-      }
+        if (windowCountCol > nameStart) {
+          writeString(grid, nameRow, windowCountCol, windowCountStr, DIM_ATTRS);
+        }
 
-      // Detail line
-      if (detailRow < this.height) {
-        const detailStart = 3;
+        // Detail line: branch name
+        if (detailRow < this.height && session.gitBranch) {
+          const detailStart = 3;
+          const maxLen = this.width - detailStart - 1;
+          let branch = session.gitBranch;
+          if (branch.length > maxLen) {
+            branch = branch.slice(0, maxLen - 1) + "\u2026";
+          }
+          writeString(grid, detailRow, detailStart, branch, DIM_ATTRS);
+        }
 
-        if (item.grouped) {
-          if (session.gitBranch) {
-            const branchCol = this.width - session.gitBranch.length - 1;
-            if (branchCol > detailStart) {
-              writeString(grid, detailRow, branchCol, session.gitBranch, DIM_ATTRS);
-            }
+        row += 2;
+      } else {
+        // Ungrouped: two rows (name + detail)
+        const detailRow = row + 1;
+
+        this.rowToSessionIndex.set(nameRow, sessionIdx);
+        if (detailRow < this.height) {
+          this.rowToSessionIndex.set(detailRow, sessionIdx);
+        }
+
+        if (isActive) {
+          writeString(grid, nameRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
+          if (detailRow < this.height) {
+            writeString(grid, detailRow, 0, "\u258e", ACTIVE_MARKER_ATTRS);
           }
-        } else {
+        }
+
+        if (session.attention) {
+          writeString(grid, nameRow, 1, "!", ATTENTION_ATTRS);
+        } else if (hasActivity) {
+          writeString(grid, nameRow, 1, "\u25CF", ACTIVITY_ATTRS);
+        }
+
+        const windowCountStr = `${session.windowCount}w`;
+        const windowCountCol = this.width - windowCountStr.length - 1;
+        const nameStart = 3;
+        const nameMaxLen = windowCountCol - 1 - nameStart;
+        let displayName = session.name;
+        if (displayName.length > nameMaxLen) {
+          displayName = displayName.slice(0, nameMaxLen - 1) + "\u2026";
+        }
+
+        const nameAttrs: CellAttrs = isActive
+          ? { ...ACTIVE_NAME_ATTRS }
+          : { ...INACTIVE_NAME_ATTRS };
+        writeString(grid, nameRow, nameStart, displayName, nameAttrs);
+
+        if (windowCountCol > nameStart) {
+          writeString(grid, nameRow, windowCountCol, windowCountStr, DIM_ATTRS);
+        }
+
+        // Detail line
+        if (detailRow < this.height) {
+          const detailStart = 3;
           let branchCols = 0;
           if (session.gitBranch) {
             const branchCol = this.width - session.gitBranch.length - 1;
@@ -285,9 +345,9 @@ export class Sidebar {
             writeString(grid, detailRow, detailStart, displayDir, DIM_ATTRS);
           }
         }
-      }
 
-      row += 2;
+        row += 2;
+      }
     }
 
     return grid;

package/src/tmux-control.ts

@@ -5,6 +5,7 @@ import type { Subprocess } from "bun";
 export type ControlEvent =
   | { type: "sessions-changed" }
   | { type: "session-changed"; args: string }
+  | { type: "session-renamed"; args: string }
   | { type: "window-renamed"; args: string }
   | { type: "client-session-changed"; args: string }
   | {
@@ -83,6 +84,11 @@ export class ControlParser {
         type: "session-changed",
         args: line.slice("%session-changed ".length),
       });
+    } else if (line.startsWith("%session-renamed ")) {
+      this.emit({
+        type: "session-renamed",
+        args: line.slice("%session-renamed ".length),
+      });
     } else if (line.startsWith("%window-renamed ")) {
       this.emit({
         type: "window-renamed",