rootiest
3414f81cb6
New Phase 1b in tests/run-tests.fish: catches a bare C1-shadowed-command call in a functions/*.fish body with no matching uses-shadow(name) or self-limiting(name) in that function's own CLASSIFICATION header. This is exactly the check discussed after the rm and cd audits -- runtime auto-unwrapping isn't viable in fish (there's no hook finer than shadowing itself, and rewriting behavior invisibly at runtime is its own footgun); a static lint using the CLASSIFICATION tag as the declared-intentional marker is. Scoped to functions/*.fish only: the one-function-per-file convention there makes body extraction exact with no block-depth parser needed. Added a new self-limiting(name) tag to the schema for the case a bare call is safe not because the caller did anything, but because the shadow's own logic already neutralizes the override: rm's and mkdir's flag checks (verified precisely -- rm falls back to command rm for any flag except a bare -r/-R/--recursive alone, which still routes to trash; mkdir falls back to command mkdir -p for any flag, no exception), and grep/fgrep/egrep/dir/vdir/cat's own tty auto-detection (--color=auto, and bat's default color behavior -- verified byte-identical to stock cat when piped, since bat also auto-disables highlighting on a non-terminal). Explicit and durable rather than a silent lint exemption: if a shadow's bypass condition is ever weakened, every self-limiting site is one grep away instead of silently wrong. Running the first draft of the lint surfaced three more real bugs, none previously audited: - config-help.fish's --man pager path checks `type -q less` (proving it wants the real less binary specifically, for less-only -R/+N flag syntax) then called it bare, routing through our own $PAGER -> ov -> less -> more -> cat fallback chain instead -- which could hand those less-specific flags to a completely different program. Now command less. - _fish_deps_install.fish and _fish_deps_update.fish's binary-upgrade paths cp a freshly downloaded binary over an already-installed one with no existence guard -- the update flow's target is guaranteed to already exist. Our cp shadow forces -i unconditionally (a plain alias, not flag-aware like rm's), so this would hang waiting on a confirmation prompt in any non-interactive run. Now command cp. Same two files' lazydocker install path piped curl output into bare bash, invoking our shell-switch wrapper instead of a plain subshell. Now command bash. - agents-init.fish's AGENTS.md/CLAUDE.md relocation calls mv bare in four places; each is already guarded by a preceding test -f check on the destination, so the -i alias was unlikely to ever fire in practice, but explicit command mv removes the reliance on that guard entirely rather than leaving it as the only thing standing between a file move and an unattended hang. The remaining ~65 flagged call sites across ~24 files were reviewed individually and tagged self-limiting(rm)/self-limiting(mkdir) (verified flagged with -f/-rf or -p) and self-limiting(grep)/ self-limiting(cat) (verified piped, captured, or -q/-c; none display color to a human), plus uses-shadow(ls) for two existence-check-only calls (cffetch.fish, ffetch.fish) whose output is redirected to /dev/null.
69 lines
2.6 KiB
Fish
69 lines
2.6 KiB
Fish
# Copyright (C) 2026 Rootiest
|
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
|
|
# COMPONENT
|
|
# logging/terminal-capture
|
|
#
|
|
# CLASSIFICATION
|
|
# self-limiting(rm,mkdir)
|
|
#
|
|
# SYNOPSIS
|
|
# __fish_config_sync_logging
|
|
#
|
|
# DESCRIPTION
|
|
# Synchronises C5 logging state: creates or removes the Kitty sentinel
|
|
# file ($XDG_CONFIG_HOME/fish/.logging_disabled), generates or removes the
|
|
# paru/yay AUR-helper log wrappers, and starts or stops tmux pipe-pane
|
|
# capture for the current pane — all based on the combined value of
|
|
# __fish_config_opinionated (master) and __fish_config_op_logging (C5).
|
|
# Called by --on-variable event handlers whenever either variable changes.
|
|
# Safe to call at any time; wrapper removal only affects files bearing
|
|
# the generated version-marker comment.
|
|
#
|
|
# EXIT STATUS
|
|
# 0 Always
|
|
#
|
|
# EXAMPLE
|
|
# __fish_config_sync_logging
|
|
function __fish_config_sync_logging --description 'Sync C5 logging state: sentinel file, paru/yay wrappers, and tmux pipe-pane'
|
|
set -l config_home $XDG_CONFIG_HOME
|
|
if test -z "$config_home"
|
|
set config_home "$HOME/.config"
|
|
end
|
|
set -l sentinel "$config_home/fish/.logging_disabled"
|
|
|
|
if __fish_config_op_enabled (status current-function)
|
|
# Logging enabled: remove sentinel
|
|
rm -f $sentinel
|
|
|
|
# Restart tmux pipe-pane for the current pane if inside tmux
|
|
_tmux_pipe_log
|
|
else
|
|
# Logging disabled: create sentinel
|
|
mkdir -p (dirname $sentinel)
|
|
touch $sentinel
|
|
|
|
# Stop tmux pipe-pane for the current pane if inside tmux
|
|
if set -q TMUX
|
|
tmux pipe-pane 2>/dev/null
|
|
end
|
|
end
|
|
|
|
# Delegate paru/yay wrapper (re)generation and removal to the canonical
|
|
# generators. They resolve the real binary via __fish_real_command
|
|
# (never /usr/bin-assumed) and independently gate on their own C2/C5
|
|
# keys, so sourcing them here covers both the enabled-regenerate and
|
|
# disabled-remove cases without duplicating that logic. Previously this
|
|
# function carried its own inferior copy (tee instead of a PTY, no
|
|
# progress-bar rendering, hard-coded /usr/bin/paru|yay), which fought
|
|
# the canonical generator for the wrapper file on every version-marker
|
|
# mismatch.
|
|
#
|
|
# Routed through _fish_source_scoped: both files `return` early on
|
|
# several guard checks, and a sourced `return` exits the *calling*
|
|
# function, which would otherwise abort this function and skip
|
|
# whichever of paru/yay hadn't run yet.
|
|
_fish_source_scoped "$__fish_config_dir/conf.d/paru-wrapper.fish"
|
|
_fish_source_scoped "$__fish_config_dir/conf.d/yay-wrapper.fish"
|
|
end
|