feat(c5): add zellij exit-capture logging and shared prune helper
Zellij has no live-stream facility like tmux pipe-pane, so capture is a one-shot 'zellij action dump-screen --full' run from a fish_exit handler (conf.d/zellij-logging.fish -> functions/_zellij_dump_log.fish). The C5 guard is checked inside the helper at exit time, so toggling logging needs no sync_logging coordination — there is no persistent stream. Extract pruning into functions/_prune_terminal_logs.fish, shared by both the tmux and zellij helpers. This also fixes a latent bug in the tmux helper: globbing tmux_*.log directly errored with 'No matches for wildcard' on the first log in an empty dir. The shared helper globs via 'set' (tolerates no-match) and uses command ls/rm to bypass the eza and trash C1 shadows.
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
# Copyright (C) 2026 Rootiest
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
# SYNOPSIS
|
||||
# _prune_terminal_logs <prefix>
|
||||
#
|
||||
# DESCRIPTION
|
||||
# Removes the oldest "<prefix>_*.log" files in SCROLLBACK_HISTORY_DIR
|
||||
# (default ~/.terminal_history) so the total count for that prefix stays
|
||||
# within SCROLLBACK_HISTORY_MAX_FILES (default 100). Files are sorted by
|
||||
# modification time, so the most recently written logs are kept — actively
|
||||
# appended logs (e.g. a tmux pipe-pane stream) survive.
|
||||
#
|
||||
# Uses `command ls`/`command rm` to bypass the C1 shadows: the bare `ls` is
|
||||
# the eza wrapper, which injects OSC-8 hyperlink escapes into paths, and the
|
||||
# bare `rm` is the trash wrapper. The glob is expanded via `set` first so a
|
||||
# no-match (empty dir / first run) yields an empty list instead of a hard
|
||||
# "No matches for wildcard" error.
|
||||
#
|
||||
# ARGUMENTS
|
||||
# prefix Log-name prefix to prune (e.g. tmux, zellij)
|
||||
#
|
||||
# RETURNS
|
||||
# 0 Always
|
||||
#
|
||||
# EXAMPLE
|
||||
# _prune_terminal_logs tmux
|
||||
function _prune_terminal_logs --argument-names prefix --description 'Prune oldest <prefix>_*.log files beyond the configured max'
|
||||
set -q prefix[1]; or return 0
|
||||
set -l log_dir (set -q SCROLLBACK_HISTORY_DIR; and echo $SCROLLBACK_HISTORY_DIR; or echo "$HOME/.terminal_history")
|
||||
set -l max_files (set -q SCROLLBACK_HISTORY_MAX_FILES; and echo $SCROLLBACK_HISTORY_MAX_FILES; or echo 100)
|
||||
test -d $log_dir; or return 0
|
||||
|
||||
# Glob via `set` so a no-match yields an empty list rather than an error.
|
||||
set -l logs $log_dir/$prefix"_"*.log
|
||||
set -q logs[1]; or return 0
|
||||
|
||||
# Re-sort by mtime, oldest first. Pass explicit files (no glob) so ls can
|
||||
# never fail on no-match; `command ls` avoids the eza OSC-8 corruption.
|
||||
set logs (command ls -1tr $logs 2>/dev/null)
|
||||
if test (count $logs) -gt $max_files
|
||||
set -l excess (math (count $logs) - $max_files)
|
||||
command rm -f $logs[1..$excess]
|
||||
end
|
||||
end
|
||||
@@ -7,11 +7,10 @@
|
||||
# DESCRIPTION
|
||||
# Starts tmux pipe-pane capture for the current pane, streaming its output
|
||||
# to a timestamped log in SCROLLBACK_HISTORY_DIR (default ~/.terminal_history).
|
||||
# Before starting, prunes the oldest tmux_*.log files so that the total stays
|
||||
# within SCROLLBACK_HISTORY_MAX_FILES (default 100), leaving room for the new
|
||||
# log. No-op when not inside a tmux session ($TMUX unset) or tmux is missing.
|
||||
# Shared by conf.d/tmux-logging.fish (shell startup) and
|
||||
# __fish_config_sync_logging (C5 re-enable) so both stay in sync.
|
||||
# Old tmux_*.log files are pruned via _prune_terminal_logs to stay within
|
||||
# SCROLLBACK_HISTORY_MAX_FILES. No-op when not inside a tmux session ($TMUX
|
||||
# unset) or tmux is missing. Shared by conf.d/tmux-logging.fish (shell
|
||||
# startup) and __fish_config_sync_logging (C5 re-enable) so both stay in sync.
|
||||
#
|
||||
# RETURNS
|
||||
# 0 Always
|
||||
@@ -23,23 +22,12 @@ function _tmux_pipe_log --description 'Start tmux pipe-pane capture for the curr
|
||||
type -q tmux; or return 0
|
||||
|
||||
set -l log_dir (set -q SCROLLBACK_HISTORY_DIR; and echo $SCROLLBACK_HISTORY_DIR; or echo "$HOME/.terminal_history")
|
||||
set -l max_files (set -q SCROLLBACK_HISTORY_MAX_FILES; and echo $SCROLLBACK_HISTORY_MAX_FILES; or echo 100)
|
||||
set -l pane_id (tmux display-message -p '#{session_name}-w#{window_index}-p#{pane_index}' 2>/dev/null)
|
||||
set -l timestamp (date "+%Y-%m-%d_%H-%M-%S")
|
||||
set -l log_file "$log_dir/tmux_"$pane_id"_"$timestamp".log"
|
||||
|
||||
mkdir -p $log_dir
|
||||
|
||||
# Prune oldest logs, leaving room for the one we're about to create.
|
||||
# Names carry a per-pane prefix, so sort by mtime (command ls -tr = oldest
|
||||
# first). Use `command ls`: the bare `ls` is shadowed by the eza wrapper,
|
||||
# which injects OSC-8 escapes into paths and corrupts the filenames.
|
||||
set -l keep (math max 0, $max_files - 1)
|
||||
set -l logs (command ls -1tr $log_dir/tmux_*.log 2>/dev/null)
|
||||
if test (count $logs) -gt $keep
|
||||
set -l excess (math (count $logs) - $keep)
|
||||
command rm -f $logs[1..$excess]
|
||||
end
|
||||
_prune_terminal_logs tmux
|
||||
|
||||
tmux pipe-pane "cat >> $log_file" 2>/dev/null
|
||||
end
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
# Copyright (C) 2026 Rootiest
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
|
||||
# SYNOPSIS
|
||||
# _zellij_dump_log
|
||||
#
|
||||
# DESCRIPTION
|
||||
# Captures the current Zellij pane's scrollback to a timestamped log in
|
||||
# SCROLLBACK_HISTORY_DIR (default ~/.terminal_history). Zellij has no live
|
||||
# output-streaming facility like tmux's pipe-pane, so this performs a one-shot
|
||||
# `zellij action dump-screen --full` — intended to run on shell exit. Old
|
||||
# zellij_*.log files are pruned via _prune_terminal_logs to stay within
|
||||
# SCROLLBACK_HISTORY_MAX_FILES.
|
||||
#
|
||||
# The C5 logging guard (__fish_config_op_logging) is evaluated here, at call
|
||||
# time, so toggling logging takes effect on the next exit without a restart.
|
||||
# No-op when logging is disabled, not inside Zellij ($ZELLIJ unset), or the
|
||||
# zellij binary is missing.
|
||||
#
|
||||
# RETURNS
|
||||
# 0 Always
|
||||
#
|
||||
# EXAMPLE
|
||||
# _zellij_dump_log
|
||||
function _zellij_dump_log --description 'Dump the current Zellij pane scrollback to a log file, with pruning'
|
||||
__fish_config_op_enabled __fish_config_op_logging; or return 0
|
||||
set -q ZELLIJ; or return 0
|
||||
type -q zellij; or return 0
|
||||
|
||||
set -l log_dir (set -q SCROLLBACK_HISTORY_DIR; and echo $SCROLLBACK_HISTORY_DIR; or echo "$HOME/.terminal_history")
|
||||
set -l session (set -q ZELLIJ_SESSION_NAME; and echo $ZELLIJ_SESSION_NAME; or echo unknown)
|
||||
set -l pane_id (set -q ZELLIJ_PANE_ID; and echo $ZELLIJ_PANE_ID; or echo unknown)
|
||||
set -l timestamp (date "+%Y-%m-%d_%H-%M-%S")
|
||||
set -l log_file "$log_dir/zellij_"$session"-p"$pane_id"_"$timestamp".log"
|
||||
|
||||
mkdir -p $log_dir
|
||||
zellij action dump-screen --full "$log_file" 2>/dev/null
|
||||
|
||||
_prune_terminal_logs zellij
|
||||
end
|
||||
Reference in New Issue
Block a user