betterterm 1.0.2 → 2.0.1

package/README.md

@@ -22,6 +22,10 @@ The installer handles everything else (tmux, yazi, carbonyl).
 - Sets up yazi as a toggleable file explorer with cd-to-terminal sync
 - Adds an in-terminal browser (carbonyl) toggled via hotkey
 - Patches your Ghostty config with Cmd-key shortcuts that map to tmux
+- Layout presets (1-4 panes) with auto-launch of Claude Code
+- Agent-aware status bar showing running AI agents per pane
+- Project session save/restore
+- Broadcast mode, pane zoom, and directional pane swapping
 
 ## Keybindings
 
@@ -40,6 +44,21 @@ The installer handles everything else (tmux, yazi, carbonyl).
 | `Cmd+R` | Reload tmux config |
 | `Ctrl+B, Tab` | Toggle between panes |
 
+### Layout & Agents
+
+| Key | Action |
+|-----|--------|
+| `Cmd+1` | Focus mode (1 pane + claude) |
+| `Cmd+2` | Dual mode (2 panes + claude) |
+| `Cmd+3` | Triple mode (3 panes + claude) |
+| `Cmd+4` | Quad mode (4 panes + claude) |
+| `Cmd+Z` | Zoom pane toggle |
+| `Cmd+Shift+B` | Broadcast toggle (type in all panes) |
+| `Cmd+S` | Save session |
+| `Cmd+O` | Load session |
+| `Cmd+Shift+Arrow` | Swap pane position |
+| `Cmd+?` | Help menu (clickable) |
+
 ## Uninstall
 
 The installer backs up any existing configs to `*.backup` files. To revert:
@@ -52,7 +71,7 @@ mv ~/.config/yazi/keymap.toml.backup ~/.config/yazi/keymap.toml
 
 # Remove betterterm block from Ghostty config (between the marker comments)
 # Remove scripts
-rm ~/.local/bin/betterterm*.sh ~/.local/bin/toggle-*.sh ~/.local/bin/open-browser.sh ~/.local/bin/close-browser.sh ~/.local/bin/browser-nav.sh
+rm ~/.local/bin/betterterm*.sh ~/.local/bin/toggle-*.sh ~/.local/bin/open-browser.sh ~/.local/bin/close-browser.sh ~/.local/bin/browser-nav.sh ~/.local/bin/layout.sh ~/.local/bin/session-*.sh ~/.local/bin/swap-pane.sh
 ```
 
 ## License

package/bin/cli.js

@@ -239,4 +239,16 @@ console.log(`
     Cmd+R           Reload tmux config
     Ctrl+B, Tab     Toggle between panes
     Opt+Enter       Send Enter to terminal
+
+  \x1b[1mLayout & Agents:\x1b[0m
+    Cmd+1           Focus mode (1 pane + claude)
+    Cmd+2           Dual mode (2 panes + claude)
+    Cmd+3           Triple mode (3 panes + claude)
+    Cmd+4           Quad mode (4 panes + claude)
+    Cmd+Z           Zoom pane toggle
+    Cmd+Shift+B     Broadcast toggle (type in all panes)
+    Cmd+S           Save session
+    Cmd+O           Load session
+    Cmd+Shift+Arrow Swap pane position
+    Cmd+?           Help menu (clickable)
 `);

package/configs/ghostty.conf

@@ -21,4 +21,33 @@ keybind = cmd+t=text:\x02c
 keybind = cmd+]=text:\x02n
 keybind = cmd+[=text:\x02p
 
+# Layout presets (unbind Ghostty tab-switching defaults first)
+keybind = cmd+1=unbind
+keybind = cmd+2=unbind
+keybind = cmd+3=unbind
+keybind = cmd+4=unbind
+keybind = cmd+1=text:\x021
+keybind = cmd+2=text:\x022
+keybind = cmd+3=text:\x023
+keybind = cmd+4=text:\x024
+
+# Project sessions
+keybind = cmd+s=text:\x02S
+keybind = cmd+o=text:\x02O
+
+# Pane zoom toggle
+keybind = cmd+z=text:\x02z
+
+# Broadcast toggle (type in all panes)
+keybind = cmd+shift+b=text:\x02a
+
+# Help menu
+keybind = cmd+shift+slash=text:\x02?
+
+# Pane swap
+keybind = cmd+shift+up=text:\x02K
+keybind = cmd+shift+down=text:\x02J
+keybind = cmd+shift+left=text:\x02H
+keybind = cmd+shift+right=text:\x02L
+
 # --- betterterm end ---

package/configs/tmux.conf

@@ -34,6 +34,31 @@ bind -r Right resize-pane -R 5
 # Reload config with prefix + r
 bind r source-file ~/.tmux.conf \; display "Config reloaded"
 
+# Layout presets (auto-launch claude)
+bind 1 run-shell "~/.local/bin/layout.sh 1"
+bind 2 run-shell "~/.local/bin/layout.sh 2"
+bind 3 run-shell "~/.local/bin/layout.sh 3"
+bind 4 run-shell "~/.local/bin/layout.sh 4"
+
+# Project sessions
+bind S run-shell "~/.local/bin/session-save.sh"
+bind O run-shell "~/.local/bin/session-load.sh"
+
+# Pane zoom (built-in toggle)
+bind z resize-pane -Z
+
+# Broadcast toggle (type in all panes simultaneously)
+bind a setw synchronize-panes
+
+# Help menu (Cmd+?)
+bind ? run-shell "~/.local/bin/help-menu.sh"
+
+# Pane swap
+bind K swap-pane -U
+bind J swap-pane -D
+bind H run-shell "~/.local/bin/swap-pane.sh left"
+bind L run-shell "~/.local/bin/swap-pane.sh right"
+
 # Better split keybindings
 bind | split-window -h -c "#{pane_current_path}"
 bind - split-window -v -c "#{pane_current_path}"
@@ -45,17 +70,17 @@ set -g allow-rename off
 set -g status-position bottom
 set -g status-style "bg=#1a1a1a,fg=#888888"
 
-# Left: status buttons (visual indicators + hotkey reminders)
-set -g status-left-length 50
-set -g status-left "#[fg=#888888,bg=#2a2a2a] Files:Cmd+E #[default] #[fg=#888888,bg=#2a2a2a] Browser:Cmd+Y #[default] "
+# Left: agent-aware pane status (or hint bar when single pane)
+set -g status-left-length 80
+set -g status-left "#(~/.local/bin/betterterm-panes.sh)"
 
 # Window list
 setw -g window-status-format "#[fg=#555555]#I:#W"
 setw -g window-status-current-format "#[fg=#cccccc,bold]#I:#W"
 
-# Right: system stats + time
-set -g status-right-length 60
-set -g status-right "#[fg=#555555]#(~/.local/bin/betterterm-stats.sh)  #[fg=#888888]%H:%M"
+# Right: broadcast indicator + system stats + time
+set -g status-right-length 80
+set -g status-right "#{?synchronize-panes,#[fg=#1a1a1a,bg=#ff5555,bold] BROADCAST #[default] ,}#[fg=#555555]#(~/.local/bin/betterterm-stats.sh)  #[fg=#888888]%H:%M"
 set -g status-interval 5
 
 set -g pane-border-style "fg=#333333"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterterm",
-  "version": "1.0.2",
+  "version": "2.0.1",
   "description": "Terminal IDE setup: Ghostty + tmux + yazi + carbonyl browser",
   "bin": {
     "betterterm": "bin/cli.js"

package/scripts/betterterm-panes.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+# Agent-aware pane status for the tmux status bar
+
+PANE_COUNT=$(tmux list-panes -F "#{pane_id}" | wc -l | tr -d ' ')
+
+# Single pane: show original hint bar
+if [ "$PANE_COUNT" -le 1 ]; then
+  echo "#[fg=#888888,bg=#2a2a2a] Files:Cmd+E #[default] #[fg=#888888,bg=#2a2a2a] Browser:Cmd+Y #[default] "
+  exit 0
+fi
+
+# Multi-pane: show per-pane agent status
+AGENTS="claude|aider|codex"
+OUTPUT=""
+
+while read -r idx cmd; do
+  label="$cmd"
+
+  # Detect known agents
+  if echo "$cmd" | grep -qiE "$AGENTS"; then
+    label=$(echo "$cmd" | grep -oiE "$AGENTS" | head -1 | tr '[:upper:]' '[:lower:]')
+    OUTPUT="${OUTPUT}#[fg=#1a1a1a,bg=#5af78e] ${idx}:${label} #[default] "
+  else
+    # Check if pane is idle (shell with no foreground process)
+    if echo "$cmd" | grep -qE "^(bash|zsh|sh|fish)$"; then
+      label="idle"
+    fi
+    OUTPUT="${OUTPUT}#[fg=#888888,bg=#2a2a2a] ${idx}:${label} #[default] "
+  fi
+done < <(tmux list-panes -F "#{pane_index} #{pane_current_command}")
+
+echo -n "$OUTPUT"

package/scripts/betterterm.sh

@@ -1,16 +1,28 @@
 #!/bin/bash
-# Start tmux with just a terminal (no file explorer)
+# Start or create a betterterm tmux session
 export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$PATH"
 TMUX=$(command -v tmux)
 
 # Use first argument as starting dir, or current dir, or home
 DIR="${1:-${PWD:-$HOME}}"
 
-# Kill old session if it exists to get a clean start
-$TMUX kill-session -t main 2>/dev/null
+# If already inside tmux, do nothing (let Ghostty handle new window)
+if [ -n "$TMUX_PANE" ]; then
+  exit 0
+fi
 
-# Create new session in the target directory (just the shell)
-$TMUX new-session -d -s main -c "$DIR"
+# Find an existing unattached session to attach to
+UNATTACHED=$($TMUX list-sessions -F "#{session_name}|#{session_attached}" 2>/dev/null | grep "|0$" | head -1 | cut -d'|' -f1)
 
-# Attach
-$TMUX attach-session -t main
+if [ -n "$UNATTACHED" ]; then
+  $TMUX attach-session -t "$UNATTACHED"
+else
+  # Create a new session with a unique name
+  SESSION="main-$(date +%s)"
+  # Use "main" for the first session
+  if ! $TMUX has-session -t main 2>/dev/null; then
+    SESSION="main"
+  fi
+  $TMUX new-session -d -s "$SESSION" -c "$DIR"
+  $TMUX attach-session -t "$SESSION"
+fi

package/scripts/help-menu.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Interactive help menu with clickable actions
+
+tmux display-menu -T "#[align=centre,bold] betterterm " -x C -y C \
+  "" \
+  "#[bold,align=centre]── Files & Browser ──" "" "" \
+  "#{?#{==:#{pane_current_command},yazi},Close,Open} File Explorer    Cmd+E" e "run-shell '~/.local/bin/toggle-yazi.sh'" \
+  "Toggle Browser               Cmd+Y" b "run-shell '~/.local/bin/toggle-browser.sh'" \
+  "Close Browser            Cmd+Sh+Y" B "run-shell '~/.local/bin/close-browser.sh'" \
+  "Browser URL Bar              Cmd+L" l "run-shell '~/.local/bin/browser-nav.sh'" \
+  "" \
+  "#[bold,align=centre]── Layout Presets ──" "" "" \
+  "Focus  (1 pane)              Cmd+1" 1 "run-shell '~/.local/bin/layout.sh 1'" \
+  "Dual   (2 panes)             Cmd+2" 2 "run-shell '~/.local/bin/layout.sh 2'" \
+  "Triple (3 panes)             Cmd+3" 3 "run-shell '~/.local/bin/layout.sh 3'" \
+  "Quad   (4 panes)             Cmd+4" 4 "run-shell '~/.local/bin/layout.sh 4'" \
+  "" \
+  "#[bold,align=centre]── Panes ──" "" "" \
+  "Zoom Pane Toggle             Cmd+Z" z "resize-pane -Z" \
+  "Broadcast Toggle         Cmd+Sh+B" a "setw synchronize-panes" \
+  "Swap Pane Up            Cmd+Sh+Up" K "swap-pane -U" \
+  "Swap Pane Down        Cmd+Sh+Down" J "swap-pane -D" \
+  "Swap Pane Left        Cmd+Sh+Left" H "run-shell '~/.local/bin/swap-pane.sh left'" \
+  "Swap Pane Right      Cmd+Sh+Right" L "run-shell '~/.local/bin/swap-pane.sh right'" \
+  "" \
+  "#[bold,align=centre]── Windows ──" "" "" \
+  "New Window                   Cmd+T" c "new-window" \
+  "Next Window                  Cmd+]" n "next-window" \
+  "Previous Window              Cmd+[" p "previous-window" \
+  "Split Vertical              Cmd+\\" "|" "split-window -h -c '#{pane_current_path}'" \
+  "Split Horizontal             Cmd+-" - "split-window -v -c '#{pane_current_path}'" \
+  "" \
+  "#[bold,align=centre]── Sessions ──" "" "" \
+  "Save Session                 Cmd+S" S "run-shell '~/.local/bin/session-save.sh'" \
+  "Load Session                 Cmd+O" O "run-shell '~/.local/bin/session-load.sh'" \
+  "" \
+  "Reload Config                Cmd+R" r "source-file ~/.tmux.conf ; display 'Config reloaded'"

package/scripts/layout.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+# Layout presets: 1-4 panes with optional auto-launch of claude
+
+COUNT="${1:-1}"
+
+# Capture current working directory before killing panes
+PWD=$(tmux display-message -p '#{pane_current_path}')
+
+# Kill all panes except pane 1, then reset it
+tmux kill-pane -a -t "{top-left}" 2>/dev/null
+tmux respawn-pane -k -c "$PWD" -t "{top-left}"
+
+# Detect if claude is available
+HAS_CLAUDE=0
+if command -v claude >/dev/null 2>&1; then
+  HAS_CLAUDE=1
+fi
+
+launch_claude() {
+  local pane="$1"
+  if [ "$HAS_CLAUDE" -eq 1 ]; then
+    tmux send-keys -t "$pane" "claude --dangerously-skip-permissions" Enter
+  fi
+}
+
+case "$COUNT" in
+  1)
+    # Focus mode: single pane
+    launch_claude 1
+    ;;
+  2)
+    # Dual mode: side-by-side
+    tmux split-window -h -c "$PWD"
+    tmux select-pane -t 1
+    launch_claude 1
+    launch_claude 2
+    ;;
+  3)
+    # Triple: big left + 2 stacked right
+    tmux split-window -h -p 40 -c "$PWD"
+    tmux split-window -v -c "$PWD"
+    tmux select-pane -t 1
+    launch_claude 1
+    launch_claude 2
+    launch_claude 3
+    ;;
+  4)
+    # Quad grid
+    tmux split-window -h -c "$PWD"
+    tmux split-window -v -c "$PWD"
+    tmux select-pane -t 1
+    tmux split-window -v -c "$PWD"
+    tmux select-pane -t 1
+    launch_claude 1
+    launch_claude 2
+    launch_claude 3
+    launch_claude 4
+    ;;
+  *)
+    tmux display-message "Usage: layout.sh [1-4]"
+    ;;
+esac

package/scripts/session-load-exec.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+# Restore a saved session: all windows, panes, layouts, directories, agents
+
+NAME="$1"
+if [ -z "$NAME" ]; then
+  tmux display-message "Session name required"
+  exit 1
+fi
+
+SESSION_FILE="$HOME/.local/share/betterterm/sessions/$NAME.session"
+
+if [ ! -f "$SESSION_FILE" ]; then
+  tmux display-message "Session not found: $NAME"
+  exit 1
+fi
+
+ACTIVE_WIN=$(grep "^ACTIVE_WINDOW=" "$SESSION_FILE" | cut -d= -f2-)
+
+# Parse windows and their panes
+CURRENT_WIN=""
+FIRST_WINDOW=1
+
+while IFS= read -r line; do
+  [[ "$line" == ACTIVE_WINDOW=* ]] && continue
+  [[ -z "$line" ]] && continue
+
+  if [[ "$line" == WINDOW=* ]]; then
+    DATA="${line#WINDOW=}"
+    WIN_IDX=$(echo "$DATA" | cut -d'|' -f1)
+    WIN_NAME=$(echo "$DATA" | cut -d'|' -f2)
+    WIN_LAYOUT=$(echo "$DATA" | cut -d'|' -f3)
+    CURRENT_WIN="$WIN_IDX"
+    PANE_NUM=0
+
+    if [ "$FIRST_WINDOW" -eq 1 ]; then
+      # Reuse the existing first window
+      tmux kill-pane -a -t "{top-left}" 2>/dev/null
+      tmux rename-window "$WIN_NAME"
+      FIRST_WINDOW=0
+    else
+      tmux new-window -n "$WIN_NAME"
+    fi
+
+  elif [[ "$line" == PANE=* ]]; then
+    DATA="${line#PANE=}"
+    PANE_IDX=$(echo "$DATA" | cut -d'|' -f1)
+    PANE_DIR=$(echo "$DATA" | cut -d'|' -f2)
+    PANE_CMD=$(echo "$DATA" | cut -d'|' -f3-)
+
+    if [ "$PANE_NUM" -eq 0 ]; then
+      # First pane in window — respawn existing pane
+      tmux respawn-pane -k -c "${PANE_DIR:-$HOME}"
+    else
+      # Additional panes
+      tmux split-window -c "${PANE_DIR:-$HOME}"
+    fi
+    PANE_NUM=$((PANE_NUM + 1))
+
+    # Re-launch agents
+    if echo "$PANE_CMD" | grep -qiE "claude|aider|codex"; then
+      tmux send-keys "$PANE_CMD" Enter
+    fi
+  fi
+done < "$SESSION_FILE"
+
+# Apply layouts per window (second pass since all panes need to exist first)
+while IFS= read -r line; do
+  if [[ "$line" == WINDOW=* ]]; then
+    DATA="${line#WINDOW=}"
+    WIN_IDX=$(echo "$DATA" | cut -d'|' -f1)
+    WIN_LAYOUT=$(echo "$DATA" | cut -d'|' -f3)
+    tmux select-layout -t ":$WIN_IDX" "$WIN_LAYOUT" 2>/dev/null
+  fi
+done < "$SESSION_FILE"
+
+# Switch to the previously active window
+tmux select-window -t ":${ACTIVE_WIN:-1}" 2>/dev/null
+tmux select-pane -t 1
+
+WIN_COUNT=$(grep -c "^WINDOW=" "$SESSION_FILE")
+tmux display-message "Session loaded: $NAME ($WIN_COUNT tabs)"

package/scripts/session-load.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Prompt user to pick a saved session, then restore it
+
+SESSION_DIR="$HOME/.local/share/betterterm/sessions"
+
+if [ ! -d "$SESSION_DIR" ] || [ -z "$(ls -A "$SESSION_DIR" 2>/dev/null)" ]; then
+  tmux display-message "No saved sessions found"
+  exit 0
+fi
+
+# Show available sessions as a tmux menu instead of a prompt
+MENU_ARGS=(-T "#[align=centre,bold] Load Session ")
+
+for f in "$SESSION_DIR"/*.session; do
+  NAME=$(basename "$f" .session)
+  MENU_ARGS+=("$NAME" "" "run-shell '~/.local/bin/session-load-exec.sh \"$NAME\"'")
+done
+
+tmux display-menu -x C -y C "${MENU_ARGS[@]}"

package/scripts/session-save-exec.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Save current tmux session: all windows, panes, layouts, directories, agents
+
+NAME="$1"
+if [ -z "$NAME" ]; then
+  tmux display-message "Session name required"
+  exit 1
+fi
+
+SESSION_DIR="$HOME/.local/share/betterterm/sessions"
+mkdir -p "$SESSION_DIR"
+
+SESSION_FILE="$SESSION_DIR/$NAME.session"
+> "$SESSION_FILE"
+
+# Save active window index
+ACTIVE_WIN=$(tmux display-message -p '#{window_index}')
+echo "ACTIVE_WINDOW=$ACTIVE_WIN" >> "$SESSION_FILE"
+
+# Iterate all windows
+tmux list-windows -F "#{window_index}|#{window_name}|#{window_layout}" | while read -r win_line; do
+  WIN_IDX=$(echo "$win_line" | cut -d'|' -f1)
+  WIN_NAME=$(echo "$win_line" | cut -d'|' -f2)
+  WIN_LAYOUT=$(echo "$win_line" | cut -d'|' -f3)
+
+  echo "WINDOW=$WIN_IDX|$WIN_NAME|$WIN_LAYOUT" >> "$SESSION_FILE"
+
+  # Save each pane in this window
+  tmux list-panes -t ":$WIN_IDX" -F "#{pane_index}|#{pane_current_path}|#{pane_current_command}|#{pane_pid}" | while read -r pane_line; do
+    PANE_IDX=$(echo "$pane_line" | cut -d'|' -f1)
+    PANE_DIR=$(echo "$pane_line" | cut -d'|' -f2)
+    PANE_PID=$(echo "$pane_line" | cut -d'|' -f4)
+
+    # Check process tree for agents
+    AGENT_CMD=""
+    if ps -o command= -g "$PANE_PID" 2>/dev/null | grep -qiE "claude|aider|codex"; then
+      AGENT_CMD=$(ps -o command= -g "$PANE_PID" 2>/dev/null | grep -iE "claude|aider|codex" | head -1)
+    fi
+
+    if [ -n "$AGENT_CMD" ]; then
+      echo "PANE=$PANE_IDX|$PANE_DIR|$AGENT_CMD" >> "$SESSION_FILE"
+    else
+      echo "PANE=$PANE_IDX|$PANE_DIR|$(echo "$pane_line" | cut -d'|' -f3)" >> "$SESSION_FILE"
+    fi
+  done
+done
+
+tmux display-message "Session saved: $NAME ($(tmux list-windows | wc -l | tr -d ' ') tabs)"

package/scripts/session-save.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Prompt user for session name, then run the actual save
+tmux command-prompt -p "Save session as:" "run-shell '~/.local/bin/session-save-exec.sh \"%%\"'"

package/scripts/swap-pane.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Swap pane in the given direction (left or right)
+
+DIRECTION="${1:-left}"
+
+case "$DIRECTION" in
+  left)
+    TARGET=$(tmux display-message -p -t "{left-of}" "#{pane_id}" 2>/dev/null)
+    ;;
+  right)
+    TARGET=$(tmux display-message -p -t "{right-of}" "#{pane_id}" 2>/dev/null)
+    ;;
+  *)
+    tmux display-message "Usage: swap-pane.sh [left|right]"
+    exit 1
+    ;;
+esac
+
+if [ -n "$TARGET" ]; then
+  tmux swap-pane -t "$TARGET"
+else
+  tmux display-message "No pane ${DIRECTION}"
+fi

package/scripts/toggle-yazi.sh

@@ -1,13 +1,19 @@
 #!/bin/bash
-# Toggle yazi file explorer pane in tmux
+# Toggle yazi file explorer as a left-side pane without disrupting layout
 export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$PATH"
 T=$(command -v tmux)
-pane_count=$($T display-message -p '#{window_panes}')
-if [ "$pane_count" -gt 1 ]; then
-    $T kill-pane -t {right}
+DIR=$($T display-message -p '#{pane_current_path}')
+
+# Check if yazi is already running in any pane
+YAZI_PANE=$($T list-panes -F "#{pane_id} #{pane_current_command}" | grep -i yazi | head -1 | awk '{print $1}')
+
+if [ -n "$YAZI_PANE" ]; then
+    # Yazi is open — kill just that pane
+    $T kill-pane -t "$YAZI_PANE"
 else
-    DIR=$($T display-message -p '#{pane_current_path}')
-    $T split-window -h -l 30% -c "$DIR" "env TERM=xterm-256color $(command -v yazi) $DIR"
-    $T select-pane -t 0
+    # Open yazi as a left-side pane (25% width), keep focus on original pane
+    CURRENT=$($T display-message -p '#{pane_id}')
+    $T split-window -hf -l 25% -c "$DIR" "env TERM=xterm-256color $(command -v yazi) $DIR"
+    $T select-pane -t "$CURRENT"
 fi
 exit 0