batipanel 0.4.24 → 0.4.26

package/VERSION

@@ -1 +1 @@
-0.4.24
+0.4.26

package/config/tmux-powerline.conf

@@ -1,5 +1,5 @@
 # powerline status bar (Nerd Font override)
-set -g status-left '#[fg=colour232,bg=colour2,bold]  #S #[fg=colour2,bg=colour234,nobold] '
-set -g status-right '#[fg=colour240,bg=colour234]#[fg=colour249,bg=colour240] #{session_windows}W #{window_panes}P #[fg=colour2,bg=colour240]#[fg=colour232,bg=colour2,bold] %H:%M  %m-%d '
-setw -g window-status-format '#[fg=colour234,bg=colour238]#[fg=colour249,bg=colour238] #I #W #[fg=colour238,bg=colour234]'
-setw -g window-status-current-format '#[fg=colour234,bg=colour33]#[fg=colour255,bg=colour33,bold] #I #W #[fg=colour33,bg=colour234]'
+set -g status-left '#[fg=colour232,bg=colour2,bold]  #S #[fg=colour2,bg=colour234,nobold] '
+set -g status-right '#[fg=colour240,bg=colour234]#[fg=colour249,bg=colour240] #{session_windows}W #{window_panes}P #[fg=colour2,bg=colour240]#[fg=colour232,bg=colour2,bold] %H:%M  %m-%d '
+setw -g window-status-format '#[fg=colour234,bg=colour238]#[fg=colour249,bg=colour238] #I #W #[fg=colour238,bg=colour234]'
+setw -g window-status-current-format '#[fg=colour234,bg=colour33]#[fg=colour255,bg=colour33,bold] #I #W #[fg=colour33,bg=colour234]'

package/install.sh

@@ -647,9 +647,24 @@ fi
 _sed_i() { sed_i "$@"; }
 export -f _sed_i 2>/dev/null || true
 
-# source shell-setup and run
+# source theme modules so _generate_themed_prompt is available
+# shellcheck source=lib/core.sh
+source "$BATIPANEL_HOME/lib/core.sh"
+# shellcheck source=lib/themes-data.sh
+source "$BATIPANEL_HOME/lib/themes-data.sh"
+# shellcheck source=lib/themes-tmux.sh
+source "$BATIPANEL_HOME/lib/themes-tmux.sh"
+# shellcheck source=lib/themes-bash.sh
+source "$BATIPANEL_HOME/lib/themes-bash.sh"
 # shellcheck source=lib/shell-setup.sh
 source "$BATIPANEL_HOME/lib/shell-setup.sh"
+
+# apply default theme (generates theme.conf, bash-prompt.sh, theme-env.sh)
+BATIPANEL_THEME="${BATIPANEL_THEME:-default}"
+_generate_theme_conf "$BATIPANEL_THEME"
+generate_theme_env "$BATIPANEL_THEME"
+
+# setup shell RC (sources prompt file from .bashrc/.zshrc)
 setup_shell_environment "$USER_SHELL" "$SHELL_RC"
 
 # === done ===

package/lib/shell-setup.sh

@@ -76,7 +76,15 @@ precmd() { vcs_info }
 zstyle ':vcs_info:git:*' formats " %F{${BP_C_GIT:-green}}(%b)%f"
 zstyle ':vcs_info:*' enable git
 
-PROMPT="%F{${BP_C_USER:-blue}}%n%f %F{${BP_C_DIR:-cyan}}%~%f\${vcs_info_msg_0_} %F{${BP_C_PROMPT:-magenta}}>%f "
+# detect powerline glyph support at runtime
+_bp_sep='>'
+case "${TERM_PROGRAM:-}" in
+  iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _bp_sep=$'\uE0B0' ;;
+esac
+[[ -n "${TMUX:-}" ]] && _bp_sep=$'\uE0B0'
+[[ "${BATIPANEL_ICONS:-0}" == "1" ]] && _bp_sep=$'\uE0B0'
+
+PROMPT="%F{${BP_C_USER:-blue}}%n%f %F{${BP_C_DIR:-cyan}}%~%f\${vcs_info_msg_0_} %F{${BP_C_PROMPT:-magenta}}${_bp_sep}%f "
 RPROMPT='%(?..%F{red}[%?]%f)'
 ZSH_PROMPT_EOF
 }
@@ -116,21 +124,36 @@ _setup_default_bash_prompt() {
 
   cat > "$prompt_file" << 'BASH_PROMPT_EOF'
 #!/usr/bin/env bash
-# batipanel bash prompt
+# batipanel bash prompt (fallback)
 
 # load theme colors
 _bp_env="$HOME/.batipanel/config/theme-env.sh"
 [ -f "$_bp_env" ] && source "$_bp_env"
 
 # set terminal colors via OSC
-if [[ "$TERM" != "dumb" ]]; then
-  printf "\e]11;${BP_BG:-#1e1e2e}\a"
-  printf "\e]10;${BP_FG:-#cdd6f4}\a"
-  printf "\e]12;${BP_CURSOR:-#f5e0dc}\a"
+if [[ "$TERM" != "dumb" ]] && [[ -n "${BP_BG:-}" ]]; then
+  printf '\e]11;%s\a' "$BP_BG"
+  printf '\e]10;%s\a' "$BP_FG"
+  printf '\e]12;%s\a' "$BP_CURSOR"
 fi
 
 __batipanel_prompt() {
   local exit_code=$?
+
+  # detect powerline glyph support at runtime
+  local sep
+  local _use_pl=0
+  case "${TERM_PROGRAM:-}" in
+    iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _use_pl=1 ;;
+  esac
+  [[ -n "${TMUX:-}" ]] && _use_pl=1
+  [[ "${BATIPANEL_ICONS:-0}" == "1" ]] && _use_pl=1
+  if (( _use_pl )); then
+    sep=$'\uE0B0'
+  else
+    sep='>'
+  fi
+
   local reset="\[\e[0m\]"
   local ps=""
   if [ "$exit_code" -ne 0 ]; then
@@ -144,7 +167,7 @@ __batipanel_prompt() {
   if [ -n "$git_branch" ]; then
     ps+=" \[\e[32m\](${git_branch})${reset}"
   fi
-  ps+=" \[\e[35m\]>${reset} "
+  ps+=" \[\e[35m\]${sep}${reset} "
   PS1="$ps"
 }
 PROMPT_COMMAND="__batipanel_prompt"

package/lib/themes-bash.sh

@@ -118,22 +118,6 @@ _generate_themed_prompt() {
     t_err_dir="\\[\\e[38;5;${t_err_fg};48;5;${prompt_dir}m\\]"
   fi
 
-  # detect glyph support: Nerd Font terminals get powerline arrows, others get ASCII
-  local use_powerline=0
-  case "${TERM_PROGRAM:-}" in
-    iTerm.app|WezTerm|kitty) use_powerline=1 ;;
-  esac
-  [[ "${BATIPANEL_ICONS:-0}" == "1" ]] && use_powerline=1
-
-  local sep_char git_icon_line
-  if (( use_powerline )); then
-    sep_char=\$\'\\\\uE0B0\'
-    git_icon_line="    local git_icon=\$'\\\\uE0A0'"
-  else
-    sep_char='>'
-    git_icon_line='    local git_icon=""'
-  fi
-
   mkdir -p "$BATIPANEL_HOME/config"
   cat > "$prompt_file" << PROMPT_EOF
 #!/usr/bin/env bash
@@ -153,8 +137,20 @@ fi
 __batipanel_prompt() {
   local exit_code=\$?
 
-  # glyph (powerline arrow or ASCII fallback)
-  local sep="${sep_char}"
+  # detect powerline glyph support at runtime
+  local sep git_icon=""
+  local _use_pl=0
+  case "\${TERM_PROGRAM:-}" in
+    iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _use_pl=1 ;;
+  esac
+  [[ -n "\${TMUX:-}" ]] && _use_pl=1
+  [[ "\${BATIPANEL_ICONS:-0}" == "1" ]] && _use_pl=1
+  if (( _use_pl )); then
+    sep=\$'\\uE0B0'
+    git_icon=\$'\\uE0A0'
+  else
+    sep='>'
+  fi
 
   # colors (generated from theme: ${theme})
   local bg_user="${bg_user}"
@@ -194,7 +190,6 @@ __batipanel_prompt() {
 
   if [ -n "\$git_branch" ]; then
     ps+="\${t_dir_git}\${sep}"
-${git_icon_line}
     if [ -n "\$git_icon" ]; then
       ps+="\${bg_git}\${fg_git} \${git_icon} \${git_branch} "
     else

package/lib/themes-tmux.sh

@@ -24,12 +24,12 @@ _generate_theme_conf() {
 
 # status bar
 set -g status-style "bg=${status_bg},fg=${status_fg}"
-set -g status-left '#[fg=${accent_fg},bg=${accent},bold]  #S #[fg=${accent},bg=${status_bg},nobold] '
-set -g status-right '#[fg=${border},bg=${status_bg}]#[fg=${win_fg},bg=${border}] #{session_windows}W #{window_panes}P #[fg=${accent},bg=${border}]#[fg=${accent_fg},bg=${accent},bold] %H:%M  %m-%d '
+set -g status-left '#[fg=${accent_fg},bg=${accent},bold]  #S #[fg=${accent},bg=${status_bg},nobold] '
+set -g status-right '#[fg=${border},bg=${status_bg}]#[fg=${win_fg},bg=${border}] #{session_windows}W #{window_panes}P #[fg=${accent},bg=${border}]#[fg=${accent_fg},bg=${accent},bold] %H:%M  %m-%d '
 
 # window tabs
-setw -g window-status-format '#[fg=${status_bg},bg=${win_bg}]#[fg=${win_fg},bg=${win_bg}] #I #W #[fg=${win_bg},bg=${status_bg}]'
-setw -g window-status-current-format '#[fg=${status_bg},bg=${win_active_bg}]#[fg=${win_active_fg},bg=${win_active_bg},bold] #I #W #[fg=${win_active_bg},bg=${status_bg}]'
+setw -g window-status-format '#[fg=${status_bg},bg=${win_bg}]#[fg=${win_fg},bg=${win_bg}] #I #W #[fg=${win_bg},bg=${status_bg}]'
+setw -g window-status-current-format '#[fg=${status_bg},bg=${win_active_bg}]#[fg=${win_active_fg},bg=${win_active_bg},bold] #I #W #[fg=${win_active_bg},bg=${status_bg}]'
 
 # pane borders
 set -g pane-border-style "fg=${border}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "batipanel",
-  "version": "0.4.24",
+  "version": "0.4.26",
   "description": "AI-powered terminal workspace manager — multi-panel tmux layouts with Claude Code, git, monitoring, and more",
   "bin": {
     "batipanel": "./bin/cli.sh"