feat(tmux): session logging, pane archive, and tmuxinator integration

config/default.nix

@@ -27,6 +27,7 @@ in
   ./pi
   ./serena
   ./starship
+  ./tmuxinator
   ./worktrunk
   ./zellij
 ]

config/tmuxinator/default.nix

@@ -0,0 +1,4 @@
+{ ... }:
+{
+  xdg.configFile."tmuxinator".source = ./tmuxinator;
+}

config/tmuxinator/tmuxinator/desktop.yml

@@ -0,0 +1,9 @@
+name: desktop
+windows:
+  - btop: btop
+  - dotfiles:
+      layout: even-horizontal
+      root: ~/dotfiles
+      panes:
+        -
+        -

config/tmuxinator/tmuxinator/mobile.yml

@@ -0,0 +1,9 @@
+name: mobile
+windows:
+  - btop: btop
+  - dotfiles:
+      layout: even-horizontal
+      root: ~/dotfiles
+      panes:
+        -
+        -

config/tmuxinator/tmuxinator/primary.yml

@@ -0,0 +1,9 @@
+name: primary
+windows:
+  - btop: btop
+  - dotfiles:
+      layout: even-horizontal
+      root: ~/dotfiles
+      panes:
+        -
+        -

config/tmuxinator/tmuxinator/work.yml

@@ -0,0 +1,4 @@
+name: work
+windows:
+  - editor: nvim
+  - shell:

home-manager/packages/default.nix

@@ -81,6 +81,7 @@ with pkgs;
   sqlite
   stern
   tealdeer
+  tmuxinator
   tokei
   tree
   turso-cli

home-manager/programs/fish/default.nix

@@ -77,7 +77,6 @@
       j = "jj";
       lzd = "lazydocker";
       lzg = "lazygit";
-      ta = "tmux new -A -s default";
       v = "nvim";
 
       # Function-based abbreviations
@@ -119,6 +118,10 @@
       tdo = "_tdo_function";
       tmo = "_tmo_function";
       tpo = "_tpo_function";
+      tsh = "_tsh_function";
+      tss = "_tss_function";
+      tsw = "_tsw_function";
+      two = "_two_function";
       zdo = "_zdo_function";
       zmo = "_zmo_function";
       zpo = "_zpo_function";
@@ -207,6 +210,10 @@
         "_tdo_function"
         "_tmo_function"
         "_tpo_function"
+        "_tsh_function"
+        "_tss_function"
+        "_tsw_function"
+        "_two_function"
         "_zdo_function"
         "_zmo_function"
         "_zpo_function"

home-manager/programs/fish/functions/_tdo_function.fish

@@ -1,3 +1,11 @@
 function _tdo_function --description "Attach to tmux desktop session"
-  tmux new-session -A -s desktop
+  if tmux has-session -t desktop 2>/dev/null
+    if test -n "$TMUX"
+      tmux switch-client -t desktop
+    else
+      tmux attach-session -t desktop
+    end
+  else
+    tmuxinator start desktop
+  end
 end

home-manager/programs/fish/functions/_tmo_function.fish

@@ -1,3 +1,11 @@
 function _tmo_function --description "Attach to tmux mobile session"
-  tmux new-session -A -s mobile
+  if tmux has-session -t mobile 2>/dev/null
+    if test -n "$TMUX"
+      tmux switch-client -t mobile
+    else
+      tmux attach-session -t mobile
+    end
+  else
+    tmuxinator start mobile
+  end
 end

home-manager/programs/fish/functions/_tpo_function.fish

@@ -1,3 +1,11 @@
 function _tpo_function --description "Attach to tmux primary session"
-  tmux new-session -A -s primary
+  if tmux has-session -t primary 2>/dev/null
+    if test -n "$TMUX"
+      tmux switch-client -t primary
+    else
+      tmux attach-session -t primary
+    end
+  else
+    tmuxinator start primary
+  end
 end

home-manager/programs/fish/functions/_tsh_function.fish

@@ -0,0 +1,79 @@
+function _tsh_function --description "Search tmux session history log or pane contents"
+  set -l log ~/.local/share/tmux/session-history.log
+  set -l pane_dir ~/.local/share/tmux/panes
+  set -l archive_dir ~/.local/share/tmux/archive
+
+  # With argument(s): search stored pane content files (live + archived)
+  if test (count $argv) -gt 0
+    if not test -d "$pane_dir"
+      echo "No pane content store found at $pane_dir"
+      return
+    end
+
+    set -l query (string join ' ' $argv)
+    set -l selected (rg -l -- "$query" "$pane_dir" "$archive_dir" 2>/dev/null \
+      | fzf --prompt="pane-search> " \
+            --height=40% \
+            --preview="rg -n -- '$query' {} 2>/dev/null | head -80" \
+            --preview-window=right:60%)
+
+    if test -z "$selected"
+      return
+    end
+
+    # work--0--0.txt or work--0--0--20260226-103000.txt → sess=work, widx=0
+    set -l fname (string replace -r '.*/' '' "$selected" \
+      | string replace -r '--\d{8}-\d{6}\.txt$' '' \
+      | string replace '.txt' '')
+    set -l parts (string split -- '--' $fname)
+    set -l sess $parts[1]
+    set -l widx $parts[2]
+
+    if not tmux has-session -t "$sess" 2>/dev/null
+      echo "Session '$sess' no longer exists (archived pane — content shown above in preview)"
+      return
+    end
+
+    if test -n "$TMUX"
+      tmux switch-client -t "$sess"
+      tmux select-window -t "$sess:$widx" 2>/dev/null
+    else
+      tmux attach-session -t "$sess" \; select-window -t "$sess:$widx"
+    end
+    return
+  end
+
+  # No argument: fzf over the history log (session/window/path metadata)
+  if not test -f "$log"
+    echo "No session history found at $log"
+    return
+  end
+
+  set -l selected (cat "$log" | fzf \
+    --prompt="session-history> " \
+    --height=40% \
+    --tac \
+    --no-sort \
+    --preview='echo {}')
+
+  if test -z "$selected"
+    return
+  end
+
+  set -l target (string split '  ' $selected)[2]
+  set -l parts (string split ':' $target)
+  set -l sess $parts[1]
+  set -l widx $parts[2]
+
+  if not tmux has-session -t "$sess" 2>/dev/null
+    echo "Session '$sess' no longer exists"
+    return
+  end
+
+  if test -n "$TMUX"
+    tmux switch-client -t "$sess"
+    tmux select-window -t "$sess:$widx" 2>/dev/null
+  else
+    tmux attach-session -t "$sess" \; select-window -t "$sess:$widx"
+  end
+end

home-manager/programs/fish/functions/_tss_function.fish

@@ -0,0 +1,52 @@
+function _tss_function --description "Fuzzy-pick or create a tmux session"
+  set -l default_sessions primary mobile desktop work
+
+  # Build candidate list: default sessions first, then any extra existing sessions
+  set -l existing (tmux list-sessions -F '#S' 2>/dev/null)
+  set -l candidates $default_sessions
+  for s in $existing
+    if not contains $s $default_sessions
+      set -a candidates $s
+    end
+  end
+
+  set -l selected (printf '%s\n' $candidates | fzf \
+    --prompt="session> " \
+    --height=40% \
+    --preview='tmux list-windows -F "#I: #W" -t {} 2>/dev/null' \
+    --bind='ctrl-x:execute-silent(tmux kill-session -t {})+abort')
+
+  if test -n "$selected"
+    if tmux has-session -t "$selected" 2>/dev/null
+      if test -n "$TMUX"
+        tmux switch-client -t "$selected"
+      else
+        tmux attach-session -t "$selected"
+      end
+    else if test "$selected" = work
+      set -l restore (tmux list-keys 2>/dev/null | string match -rg '(/\S+/resurrect/scripts/restore\.sh)')
+      set -l restore $restore[1]
+      if test -n "$restore"
+        tmux run-shell "$restore"
+      end
+      if tmux has-session -t work 2>/dev/null
+        if test -n "$TMUX"
+          tmux switch-client -t work
+        else
+          tmux attach-session -t work
+        end
+      else
+        tmuxinator start work
+      end
+    else if contains $selected $default_sessions
+      tmuxinator start "$selected"
+    else
+      tmux new-session -d -s "$selected"
+      if test -n "$TMUX"
+        tmux switch-client -t "$selected"
+      else
+        tmux attach-session -t "$selected"
+      end
+    end
+  end
+end

home-manager/programs/fish/functions/_tsw_function.fish

@@ -0,0 +1,21 @@
+function _tsw_function --description "Fuzzy-pick any window across all sessions"
+  set -l selected (tmux list-windows -a -F '#{session_name}:#{window_index}  #{window_name}' 2>/dev/null \
+    | fzf --prompt="window> " --height=40% \
+          --preview='set t (string split "  " {})[1]; tmux list-panes -t $t -F "#P: #{pane_current_command}  #{pane_current_path}" 2>/dev/null')
+
+  if test -z "$selected"
+    return
+  end
+
+  set -l target (string split '  ' $selected)[1]   # "session:index"
+  set -l parts (string split ':' $target)
+  set -l sess $parts[1]
+  set -l widx $parts[2]
+
+  if test -n "$TMUX"
+    tmux switch-client -t "$sess"
+    tmux select-window -t "$sess:$widx"
+  else
+    tmux attach-session -t "$sess" \; select-window -t "$sess:$widx"
+  end
+end

home-manager/programs/fish/functions/_two_function.fish

@@ -0,0 +1,17 @@
+function _two_function --description "Attach to tmux work session"
+  set -l restore (tmux list-keys 2>/dev/null | string match -rg '(/\S+/resurrect/scripts/restore\.sh)')
+  set -l restore $restore[1]
+  if test -n "$restore"
+    tmux run-shell "$restore"
+  end
+
+  if tmux has-session -t work 2>/dev/null
+    if test -n "$TMUX"
+      tmux switch-client -t work
+    else
+      tmux attach-session -t work
+    end
+  else
+    tmuxinator start work
+  end
+end

home-manager/programs/tmux/default.nix

@@ -1,5 +1,10 @@
 { pkgs, ... }:
 {
+  home.file.".config/tmux/session-logger.sh" = {
+    executable = true;
+    source = ./session-logger.sh;
+  };
+
   programs.tmux = {
     enable = true;
     extraConfig = builtins.readFile ./tmux.conf;

home-manager/programs/tmux/session-logger.sh

@@ -0,0 +1,44 @@
+#!/usr/bin/env sh
+mkdir -p ~/.local/share/tmux/panes
+mkdir -p ~/.local/share/tmux/archive
+LOG=~/.local/share/tmux/session-history.log
+PANE_DIR=~/.local/share/tmux/panes
+ARCHIVE_DIR=~/.local/share/tmux/archive
+
+while true; do
+  sleep 30
+
+  # Append window metadata
+  tmux list-windows -a \
+    -F "$(date +%Y-%m-%dT%H:%M:%S)  #{session_name}:#{window_index}  #{window_name}  #{pane_current_path}" \
+    >>"$LOG" 2>/dev/null
+
+  # Rotate existing live snapshots to .old
+  for f in "$PANE_DIR"/*.txt; do
+    [ -f "$f" ] && mv "$f" "${f%.txt}.old"
+  done
+
+  # Recapture all currently live panes
+  tmux list-panes -a -F "#{session_name} #{window_index} #{pane_index} #{pane_id}" \
+    2>/dev/null | while IFS= read -r line; do
+    sess=$(printf '%s' "$line" | cut -d' ' -f1)
+    widx=$(printf '%s' "$line" | cut -d' ' -f2)
+    pidx=$(printf '%s' "$line" | cut -d' ' -f3)
+    pane_id=$(printf '%s' "$line" | cut -d' ' -f4)
+    tmux capture-pane -pt "$pane_id" -S - 2>/dev/null \
+      >"$PANE_DIR/$sess--$widx--$pidx.txt"
+  done
+
+  # For each .old: if a live .txt exists → pane survived → delete .old
+  #                if no live .txt  → pane closed  → archive with timestamp
+  ts=$(date +%Y%m%d-%H%M%S)
+  for old in "$PANE_DIR"/*.old; do
+    [ -f "$old" ] || continue
+    base=$(basename "${old%.old}")
+    if [ -f "$PANE_DIR/$base.txt" ]; then
+      rm -f "$old"
+    else
+      mv "$old" "$ARCHIVE_DIR/${base}--${ts}.txt"
+    fi
+  done
+done

home-manager/programs/tmux/tmux.conf

@@ -136,5 +136,19 @@ set -g @thumbs-key Space
 # Sessionx (session manager)
 set -g @sessionx-bind 'o'
 
+# Tmux sessionizer (fzf session picker)
+bind S run-shell "tmux new-window 'fish -c _tss_function'"
+
+# Last session (quick flip)
+bind Tab switch-client -l
+
+# Cross-session window picker
+bind W run-shell "tmux new-window 'fish -c _tsw_function'"
+
 # Extrakto (text extraction)
 set -g @extrakto_key 'tab'
+
+set -g history-limit 0
+
+# Persistent session history logger (starts once per server boot)
+set-hook -g 'server-startup' 'run-shell -b "~/.config/tmux/session-logger.sh"'

spec/coverage_spec.sh

@@ -149,6 +149,7 @@ home-manager/modules/uv-globals/install-uv-globals.sh
 home-manager/modules/yek/install-yek.sh
 home-manager/modules/yek/yek.sh
 home-manager/programs/neovim/run_tests.sh
+home-manager/programs/tmux/session-logger.sh
 home-manager/services/brew-upgrader/upgrade.sh
 home-manager/services/cliproxyapi/scripts/backup.sh
 home-manager/services/cliproxyapi/scripts/hydrate.sh