betterterm 2.0.0 → 2.0.2

package/configs/tmux.conf

@@ -51,6 +51,7 @@ bind z resize-pane -Z
 bind a setw synchronize-panes
 
 # Help menu (Cmd+?)
+unbind ?
 bind ? run-shell "~/.local/bin/help-menu.sh"
 
 # Pane swap

package/package.json

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

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/session-load-exec.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Restore a saved session: layout + per-pane directories + agents
+# Restore a saved session: all windows, panes, layouts, directories, agents
 
 NAME="$1"
 if [ -z "$NAME" ]; then
@@ -14,46 +14,68 @@ if [ ! -f "$SESSION_FILE" ]; then
   exit 1
 fi
 
-# Read layout
-LAYOUT=$(grep "^LAYOUT=" "$SESSION_FILE" | cut -d= -f2-)
+ACTIVE_WIN=$(grep "^ACTIVE_WINDOW=" "$SESSION_FILE" | cut -d= -f2-)
+
+# Parse windows and their panes
+CURRENT_WIN=""
+FIRST_WINDOW=1
 
-# Read pane info (index|path|command)
-PANE_LINES=()
 while IFS= read -r line; do
-  [[ "$line" == LAYOUT=* ]] && continue
+  [[ "$line" == ACTIVE_WINDOW=* ]] && continue
   [[ -z "$line" ]] && continue
-  PANE_LINES+=("$line")
-done < "$SESSION_FILE"
 
-PANE_COUNT=${#PANE_LINES[@]}
-[ "$PANE_COUNT" -eq 0 ] && PANE_COUNT=1
+  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
 
-# Kill all panes except first, respawn first
-tmux kill-pane -a -t "{top-left}" 2>/dev/null
+    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
 
-# Get first pane's directory
-FIRST_DIR=$(echo "${PANE_LINES[0]}" | cut -d'|' -f2)
-tmux respawn-pane -k -c "${FIRST_DIR:-$HOME}"
+  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-)
 
-# Create remaining panes
-for ((i = 1; i < PANE_COUNT; i++)); do
-  DIR=$(echo "${PANE_LINES[$i]}" | cut -d'|' -f2)
-  tmux split-window -c "${DIR:-$HOME}"
-done
+    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))
 
-# Apply saved layout
-tmux select-layout "$LAYOUT" 2>/dev/null
-
-# Re-launch known agents in each pane
-AGENTS_RE="^(claude|aider|codex)$"
-for ((i = 0; i < PANE_COUNT; i++)); do
-  CMD=$(echo "${PANE_LINES[$i]}" | cut -d'|' -f3)
-  PANE_IDX=$((i + 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"
 
-  if echo "$CMD" | grep -qiE "$AGENTS_RE"; then
-    tmux send-keys -t "$PANE_IDX" "$CMD" Enter
+# 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
+done < "$SESSION_FILE"
 
+# Switch to the previously active window
+tmux select-window -t ":${ACTIVE_WIN:-1}" 2>/dev/null
 tmux select-pane -t 1
-tmux display-message "Session loaded: $NAME"
+
+WIN_COUNT=$(grep -c "^WINDOW=" "$SESSION_FILE")
+tmux display-message "Session loaded: $NAME ($WIN_COUNT tabs)"

package/scripts/session-load.sh

@@ -8,7 +8,12 @@ if [ ! -d "$SESSION_DIR" ] || [ -z "$(ls -A "$SESSION_DIR" 2>/dev/null)" ]; then
   exit 0
 fi
 
-# List available sessions (strip .session extension)
-SESSIONS=$(ls "$SESSION_DIR"/*.session 2>/dev/null | xargs -I{} basename {} .session | tr '\n' ',' | sed 's/,$//')
+# Show available sessions as a tmux menu instead of a prompt
+MENU_ARGS=(-T "#[align=centre,bold] Load Session ")
 
-tmux command-prompt -p "Load session ($SESSIONS):" "run-shell '~/.local/bin/session-load-exec.sh \"%%\"'"
+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

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Save current tmux layout and pane state to a session file
+# Save current tmux session: all windows, panes, layouts, directories, agents
 
 NAME="$1"
 if [ -z "$NAME" ]; then
@@ -11,19 +11,38 @@ SESSION_DIR="$HOME/.local/share/betterterm/sessions"
 mkdir -p "$SESSION_DIR"
 
 SESSION_FILE="$SESSION_DIR/$NAME.session"
+> "$SESSION_FILE"
 
-# Capture layout string
-LAYOUT=$(tmux display-message -p "#{window_layout}")
+# Save active window index
+ACTIVE_WIN=$(tmux display-message -p '#{window_index}')
+echo "ACTIVE_WINDOW=$ACTIVE_WIN" >> "$SESSION_FILE"
 
-# Capture per-pane info: index, working directory, current command
-PANES=""
-while IFS= read -r line; do
-  PANES="${PANES}${line}\n"
-done < <(tmux list-panes -F "#{pane_index}|#{pane_current_path}|#{pane_current_command}")
+# 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)
 
-cat > "$SESSION_FILE" <<EOF
-LAYOUT=$LAYOUT
-$PANES
-EOF
+  echo "WINDOW=$WIN_IDX|$WIN_NAME|$WIN_LAYOUT" >> "$SESSION_FILE"
 
-tmux display-message "Session saved: $NAME"
+  # 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)"