batipanel 0.4.30 → 0.4.32

package/README.md

@@ -445,10 +445,22 @@ All optional tools are auto-installed when possible. Missing tools gracefully fa
 
 | Platform | Supported Terminals |
 |----------|---------------------|
-| **macOS** | iTerm2, Terminal.app, Alacritty, Kitty, WezTerm, Warp |
+| **macOS** | Terminal.app, iTerm2, Alacritty, Kitty, WezTerm, Warp |
 | **Linux** | GNOME Terminal, Konsole, Alacritty, Kitty, WezTerm, xterm |
 | **Windows** | Windows Terminal + WSL2 |
 
+### macOS Terminal.app (built-in)
+
+batipanel works out of the box with macOS's built-in Terminal. The installer automatically:
+
+- Installs **Nerd Font** (MesloLGS NF) via Homebrew
+- Sets the font on your Terminal profile via `osascript`
+- Applies **theme colors** (background, text, cursor) to your profile
+
+All layouts, panels, keyboard shortcuts, 256-color themes, Powerline arrows, and session resume work fully.
+
+> **Want true color (24-bit)?** Use [iTerm2](https://iterm2.com) for the richest color experience. Terminal.app supports 256 colors which covers all themes well.
+
 <details>
 <summary><b>Troubleshooting</b></summary>
 
@@ -458,6 +470,8 @@ All optional tools are auto-installed when possible. Missing tools gracefully fa
 
 **"claude CLI not installed"?** Run `curl -fsSL https://claude.ai/install.sh | bash`. Everything else still works without it.
 
+**Powerline arrows showing as ">"?** Make sure your terminal font is set to a Nerd Font (e.g., MesloLGS NF). On macOS, the installer sets this automatically.
+
 **WSL clipboard not working?** Run `sudo apt install xclip`.
 
 **Navigation**: Use `Alt + h/j/k/l` to switch panels, `Alt + f` to zoom, mouse click to select.

package/VERSION

@@ -1 +1 @@
-0.4.30
+0.4.32

package/install.sh

@@ -153,6 +153,18 @@ if tmux -f /dev/null new-session -d -s _bp_smoke -x 10 -y 5 2>/dev/null; then
   _tmux_smoke_ok=1
 fi
 
+# if smoke test failed, clean stale socket and retry (common on macOS)
+if [ "$_tmux_smoke_ok" = "0" ]; then
+  tmux kill-server 2>/dev/null || true
+  rm -rf "/tmp/tmux-$(id -u)/" "/private/tmp/tmux-$(id -u)/" 2>/dev/null || true
+  sleep 0.3
+  if tmux -f /dev/null new-session -d -s _bp_smoke -x 10 -y 5 2>/dev/null; then
+    tmux kill-session -t _bp_smoke 2>/dev/null || true
+    _tmux_smoke_ok=1
+    echo "  Cleared stale tmux socket — tmux is working now."
+  fi
+fi
+
 if [ "$_tmux_smoke_ok" = "0" ]; then
   echo ""
   echo "WARNING: tmux is installed but fails to start (server exited unexpectedly)."
@@ -162,9 +174,9 @@ if [ "$_tmux_smoke_ok" = "0" ]; then
     rm -f "$BATIPANEL_HOME/bin/tmux"
   fi
   if [ "$OS" = "Darwin" ]; then
-    echo "  Please install tmux via Homebrew:  brew install tmux"
+    echo "  Try: brew reinstall tmux"
   else
-    echo "  Please install tmux via package manager:  sudo apt install tmux"
+    echo "  Try: sudo apt install --reinstall tmux"
   fi
   # re-check after removing mamba wrapper
   if command -v tmux &>/dev/null && tmux -f /dev/null new-session -d -s _bp_smoke2 -x 10 -y 5 2>/dev/null; then
@@ -512,6 +524,8 @@ fi
 
 # kill stale tmux server so new config takes effect
 tmux kill-server 2>/dev/null || true
+# clean stale socket (dead server leaves socket behind, blocks new sessions)
+rm -rf "/tmp/tmux-$(id -u)/" "/private/tmp/tmux-$(id -u)/" 2>/dev/null || true
 
 # clean ~/.tmux.conf (remove ALL old batipanel lines, then add fresh)
 BATIPANEL_SOURCE_LINE="source-file $BATIPANEL_HOME/config/tmux.conf"
@@ -555,7 +569,7 @@ esac
 
 BATIPANEL_ALIAS="alias batipanel='bash \"$BATIPANEL_HOME/bin/start.sh\"'"
 # b is a function (not alias) so theme changes can auto-reload the prompt
-SHORT_FUNC="b() { bash \"$BATIPANEL_HOME/bin/start.sh\" \"\$@\"; if [[ \"\${1:-}\" == \"theme\" || (\"\${1:-}\" == \"config\" && \"\${2:-}\" == \"theme\") ]]; then if [ -n \"\${ZSH_VERSION:-}\" ]; then local _pf=\"$BATIPANEL_HOME/config/zsh-prompt.zsh\"; [ -f \"\$_pf\" ] && source \"\$_pf\"; else local _pf=\"$BATIPANEL_HOME/config/bash-prompt.sh\"; [ -f \"\$_pf\" ] && source \"\$_pf\"; fi; fi; }"
+SHORT_FUNC="b() { bash \"$BATIPANEL_HOME/bin/start.sh\" \"\$@\"; if [[ \"\${1:-}\" == \"theme\" && -n \"\${2:-}\" ]] || [[ \"\${1:-}\" == \"config\" && \"\${2:-}\" == \"theme\" && -n \"\${3:-}\" ]]; then if [ -n \"\${ZSH_VERSION:-}\" ]; then local _pf=\"$BATIPANEL_HOME/config/zsh-prompt.zsh\"; [ -f \"\$_pf\" ] && source \"\$_pf\"; else local _pf=\"$BATIPANEL_HOME/config/bash-prompt.sh\"; [ -f \"\$_pf\" ] && source \"\$_pf\"; fi; fi; }"
 
 # Always register 'batipanel' alias
 if grep -q "alias batipanel=" "$SHELL_RC" 2>/dev/null; then
@@ -614,9 +628,13 @@ if [ "$NEED_LOCAL_BIN_PATH" = "1" ]; then
 fi
 
 # === 8b. enable powerline glyphs by default ===
+# only auto-enable on terminals known to support Nerd Fonts well
+# Apple Terminal: defer to batipanel profile setup (sets BATIPANEL_ICONS=1 after font confirmed)
 if ! grep -qF 'BATIPANEL_ICONS' "$SHELL_RC" 2>/dev/null; then
-  echo 'export BATIPANEL_ICONS="1"' >> "$SHELL_RC"
-  echo "  Enabled powerline glyphs (BATIPANEL_ICONS=1)"
+  if [ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]; then
+    echo 'export BATIPANEL_ICONS="1"' >> "$SHELL_RC"
+    echo "  Enabled powerline glyphs (BATIPANEL_ICONS=1)"
+  fi
 fi
 
 # === 9. register tab completion ===
@@ -648,11 +666,41 @@ else
   fi
 fi
 
-# === 9b. install Nerd Font + recommend iTerm2 (macOS) ===
+# === 9b. install Nerd Font + configure terminal ===
+_install_nerd_font_linux() {
+  local font_dir="$HOME/.local/share/fonts"
+  # skip if already installed
+  if ls "$font_dir"/MesloLGS* &>/dev/null 2>&1; then
+    return 0
+  fi
+  echo "  Installing Nerd Font (MesloLGS NF) for powerline glyphs..."
+  mkdir -p "$font_dir"
+  local base_url="https://github.com/romkatv/powerlevel10k-media/raw/master"
+  local fonts=(
+    "MesloLGS NF Regular.ttf"
+    "MesloLGS NF Bold.ttf"
+    "MesloLGS NF Italic.ttf"
+    "MesloLGS NF Bold Italic.ttf"
+  )
+  for f in "${fonts[@]}"; do
+    local encoded="${f// /%20}"
+    curl -fsSL "$base_url/$encoded" -o "$font_dir/$f" 2>/dev/null || true
+  done
+  # rebuild font cache
+  if command -v fc-cache &>/dev/null; then
+    fc-cache -f "$font_dir" 2>/dev/null || true
+  fi
+  echo "    Nerd Font installed to $font_dir"
+}
+
+if [ "$OS" = "Linux" ]; then
+  _install_nerd_font_linux
+fi
+
 if [ "$OS" = "Darwin" ]; then
   echo ""
 
-  # install Nerd Font
+  # install Nerd Font via Homebrew
   if command -v brew &>/dev/null; then
     if ! brew list --cask font-meslo-lg-nerd-font &>/dev/null 2>&1; then
       echo "Installing Nerd Font (MesloLGS NF) for powerline glyphs..."
@@ -660,18 +708,123 @@ if [ "$OS" = "Darwin" ]; then
     fi
   fi
 
-  # recommend iTerm2 if not installed and user is on Apple Terminal
+  # auto-configure Apple Terminal: create/update "batipanel" profile
   if [ "${TERM_PROGRAM:-}" = "Apple_Terminal" ]; then
-    # check if iTerm2 is already installed
-    if [ ! -d "/Applications/iTerm.app" ]; then
-      echo "Recommended: install iTerm2 for full theme & color support."
-      if command -v brew &>/dev/null; then
-        echo "  brew install --cask iterm2"
+    _bp_profile="batipanel"
+    _current_profile=$(defaults read com.apple.Terminal "Default Window Settings" 2>/dev/null || echo "Basic")
+
+    # hex to AppleScript RGB helper
+    _hex_to_applescript_rgb() {
+      local hex="${1#\#}"
+      local r=$((16#${hex:0:2}))
+      local g=$((16#${hex:2:2}))
+      local b=$((16#${hex:4:2}))
+      echo "$((r * 257)), $((g * 257)), $((b * 257))"
+    }
+
+    # get theme colors
+    _bp_theme="${BATIPANEL_THEME:-default}"
+    _bp_term_colors=""
+    if declare -f _get_theme_terminal_colors &>/dev/null; then
+      _bp_term_colors=$(_get_theme_terminal_colors "$_bp_theme")
+    else
+      _bp_term_colors="#1e1e2e #cdd6f4 #f5e0dc blue cyan green magenta"
+    fi
+    read -r _bp_bg _bp_fg _bp_cursor _ <<< "$_bp_term_colors"
+
+    # create or update the batipanel profile
+    _setup_bp_profile() {
+      echo "  Setting up Apple Terminal profile: ${_bp_profile}..."
+
+      # create profile by duplicating current one (inherits encoding, shell settings)
+      osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  -- duplicate current profile as base if batipanel doesn't exist yet
+  if not (exists settings set "${_bp_profile}") then
+    set baseProfile to settings set "${_current_profile}"
+    set newProfile to make new settings set with properties {name:"${_bp_profile}"}
+  end if
+end tell
+APPLESCRIPT
+
+      # set Nerd Font (try v3, v2, mono variants)
+      local _nf_applied=false
+      for _nf_name in "MesloLGSNF-Regular" "MesloLGSNerdFont-Regular" "MesloLGS-NF-Regular"; do
+        if osascript -e "tell application \"Terminal\" to set font name of settings set \"${_bp_profile}\" to \"${_nf_name}\"" 2>/dev/null; then
+          _nf_applied=true
+          break
+        fi
+      done
+      if [ "$_nf_applied" = true ]; then
+        # font confirmed — enable powerline glyphs
+        if ! grep -qF 'BATIPANEL_ICONS' "$SHELL_RC" 2>/dev/null; then
+          echo 'export BATIPANEL_ICONS="1"' >> "$SHELL_RC"
+        fi
       else
-        echo "  https://iterm2.com/downloads.html"
+        echo "    Warning: Could not set Nerd Font. Powerline glyphs may not render."
+        echo "    Install manually: brew install --cask font-meslo-lg-nerd-font"
       fi
+      osascript -e "tell application \"Terminal\" to set font size of settings set \"${_bp_profile}\" to 13" 2>/dev/null || true
+
+      # apply theme colors to the batipanel profile
+      if [[ "$_bp_bg" =~ ^# ]]; then
+        local bg_rgb fg_rgb cursor_rgb
+        bg_rgb=$(_hex_to_applescript_rgb "$_bp_bg")
+        fg_rgb=$(_hex_to_applescript_rgb "$_bp_fg")
+        cursor_rgb=$(_hex_to_applescript_rgb "$_bp_cursor")
+        osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  set background color of settings set "${_bp_profile}" to {${bg_rgb}}
+  set normal text color of settings set "${_bp_profile}" to {${fg_rgb}}
+  set cursor color of settings set "${_bp_profile}" to {${cursor_rgb}}
+end tell
+APPLESCRIPT
+      fi
+
+      # set as default profile for new windows
+      osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  set default settings to settings set "${_bp_profile}"
+  set startup settings to settings set "${_bp_profile}"
+end tell
+APPLESCRIPT
+
+      # apply to current window
+      osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  set w to front window
+  set current settings of w to settings set "${_bp_profile}"
+end tell
+APPLESCRIPT
+      echo "    Profile '${_bp_profile}' configured and set as default"
+    }
+
+    if [ "$_current_profile" = "$_bp_profile" ]; then
+      # already using batipanel profile — update it silently
+      _setup_bp_profile
     else
-      echo "iTerm2 is installed. Use iTerm2 for the best experience."
+      # first install or different profile — ask user
+      echo ""
+      echo "  Apple Terminal detected (current profile: ${_current_profile})"
+      echo "  batipanel can create a dedicated '${_bp_profile}' profile with:"
+      echo "    - Nerd Font (MesloLGS) for powerline glyphs"
+      echo "    - Dark theme colors"
+      echo ""
+      printf "  Apply batipanel Terminal profile? [Y/n] "
+      _bp_answer=""
+      if [ -t 0 ]; then
+        read -r _bp_answer
+      else
+        read -r _bp_answer < /dev/tty 2>/dev/null || _bp_answer="y"
+      fi
+      case "$_bp_answer" in
+        [nN]*)
+          echo "  Skipped. You can set your font to a Nerd Font manually."
+          ;;
+        *)
+          _setup_bp_profile
+          ;;
+      esac
     fi
   fi
 fi
@@ -745,24 +898,19 @@ echo "  b config layout 7panel       # Change default layout"
 echo "  b theme                      # List/change color themes"
 echo ""
 if [ "${TERM_PROGRAM:-}" = "Apple_Terminal" ]; then
-  echo "** Apple Terminal does not support background color themes. **"
+  echo "Apple Terminal: using 'batipanel' profile with Nerd Font + theme colors."
   echo ""
-  if [ -d "/Applications/iTerm.app" ]; then
-    echo "Next steps:"
-    echo "  1. Open iTerm2"
-    echo "  2. Set font: iTerm2 > Settings > Profiles > Text > Font > MesloLGS NF"
-    echo "  3. Type: b"
-  else
-    echo "Next steps:"
-    echo "  1. Install iTerm2:"
+  echo "Type: b"
+  echo ""
+  echo "Tip: For the best experience (true color, native tabs), try iTerm2:"
+  if [ ! -d "/Applications/iTerm.app" ]; then
     if command -v brew &>/dev/null; then
-      echo "     brew install --cask iterm2"
+      echo "  brew install --cask iterm2"
     else
-      echo "     https://iterm2.com/downloads.html"
+      echo "  https://iterm2.com/downloads.html"
     fi
-    echo "  2. Open iTerm2"
-    echo "  3. Set font: iTerm2 > Settings > Profiles > Text > Font > MesloLGS NF"
-    echo "  4. Type: b"
+  else
+    echo "  iTerm2 is already installed — open it and type: b"
   fi
 else
   echo "Tip: Set your terminal font to a Nerd Font (e.g. MesloLGS NF)"
@@ -771,10 +919,14 @@ else
   echo "Type: b"
 fi
 
-# === reload shell so prompt theme applies immediately ===
-# only exec when running interactively (not from npm postinstall or scripts)
-if [ -t 0 ] && [ -t 1 ] && [ -z "${npm_lifecycle_event:-}" ]; then
+# === activate prompt theme ===
+# don't exec $SHELL — it breaks /dev/tty when run from curl|bash or subshells
+if [ -z "${npm_lifecycle_event:-}" ]; then
+  echo ""
+  echo -e "\033[1;33m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\033[0m"
+  echo -e "\033[1;33m  Activate batipanel (choose one):\033[0m"
   echo ""
-  echo "Reloading shell to apply prompt theme..."
-  exec "$SHELL" -l
+  echo -e "  \033[1;32m▶ exec \$SHELL -l\033[0m        ← paste this"
+  echo -e "  \033[1;32m▶ restart terminal\033[0m       ← or just close & reopen"
+  echo -e "\033[1;33m━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\033[0m"
 fi

package/lib/layout.sh

@@ -21,30 +21,55 @@ init_layout() {
   local tmux_err
   tmux_err=$(tmux new-session -d -s "$session" -c "$project" -x 220 -y 60 2>&1) || {
     debug_log "init_layout: first attempt failed: $tmux_err"
-    # retry with safe TERM
-    debug_log "init_layout: retrying with TERM=xterm-256color"
-    tmux_err=$(TERM=xterm-256color tmux new-session -d -s "$session" -c "$project" -x 220 -y 60 2>&1) || {
-      debug_log "init_layout: second attempt failed: $tmux_err"
-      # check if session was created by a concurrent invocation
-      if tmux has-session -t "$session" 2>/dev/null; then
-        debug_log "init_layout: session already exists (concurrent creation)"
-        return 0
-      fi
-      echo -e "${RED}Failed to create tmux session '$session'${NC}"
-      # provide specific guidance based on error
-      if [[ "$tmux_err" == *"open terminal failed"* ]]; then
-        echo "  Error: open terminal failed (terminfo issue)"
-        echo "  Try: export TERM=xterm-256color && b $session"
-      elif [[ "$tmux_err" == *"server"* ]] || [[ "$tmux_err" == *"socket"* ]]; then
-        echo "  Stale tmux server? Try: tmux kill-server"
-      elif [[ "$tmux_err" == *"library"* ]] || [[ "$tmux_err" == *"dylib"* ]]; then
-        echo "  Library issue — try reinstalling tmux"
-      else
-        echo "  tmux error: $tmux_err"
-      fi
-      return 1
-    }
+
+    # if "server exited unexpectedly", clean stale socket and retry
+    if [[ "$tmux_err" == *"server exited"* ]] || [[ "$tmux_err" == *"server"* ]]; then
+      debug_log "init_layout: cleaning stale socket and retrying"
+      tmux kill-server 2>/dev/null || true
+      rm -rf "/tmp/tmux-$(id -u)/" "/private/tmp/tmux-$(id -u)/" 2>/dev/null || true
+      sleep 0.3
+      tmux_err=$(tmux new-session -d -s "$session" -c "$project" -x 220 -y 60 2>&1) && {
+        debug_log "init_layout: succeeded after socket cleanup"
+        # fall through to success path below
+        tmux_err=""
+      }
+    fi
+
+    # if still failing, retry with safe TERM
+    if [ -n "$tmux_err" ]; then
+      debug_log "init_layout: retrying with TERM=xterm-256color"
+      tmux_err=$(TERM=xterm-256color tmux new-session -d -s "$session" -c "$project" -x 220 -y 60 2>&1) || {
+        debug_log "init_layout: all attempts failed: $tmux_err"
+        # check if session was created by a concurrent invocation
+        if tmux has-session -t "$session" 2>/dev/null; then
+          debug_log "init_layout: session already exists (concurrent creation)"
+          return 0
+        fi
+        echo -e "${RED}Failed to create tmux session '$session'${NC}"
+        # provide specific guidance based on error
+        if [[ "$tmux_err" == *"open terminal failed"* ]]; then
+          echo "  Error: open terminal failed (terminfo issue)"
+          echo "  Try: export TERM=xterm-256color && b $session"
+        elif [[ "$tmux_err" == *"server"* ]] || [[ "$tmux_err" == *"socket"* ]]; then
+          echo "  Stale tmux socket. Tried auto-cleanup but still failing."
+          echo "  Try: rm -rf /tmp/tmux-\$(id -u)/ && b $session"
+        elif [[ "$tmux_err" == *"library"* ]] || [[ "$tmux_err" == *"dylib"* ]]; then
+          echo "  Library issue — try reinstalling tmux"
+        else
+          echo "  tmux error: $tmux_err"
+        fi
+        return 1
+      }
+    fi
   }
+
+  # pass parent terminal info into tmux so prompts can detect Apple Terminal etc.
+  if [ -n "${TERM_PROGRAM:-}" ]; then
+    tmux set-environment -t "$session" TERM_PROGRAM "$TERM_PROGRAM"
+  fi
+  if [ -n "${TERM_PROGRAM_VERSION:-}" ]; then
+    tmux set-environment -t "$session" TERM_PROGRAM_VERSION "$TERM_PROGRAM_VERSION"
+  fi
 }
 
 # Wait for shell init after pane splits

package/lib/session.sh

@@ -79,8 +79,9 @@ tmux_start() {
   fi
 
   echo -e "  ${YELLOW}Tip:${NC} Detach with Ctrl+b d  |  Stop with: b stop $SESSION"
-  # attach to session (exec replaces this process)
-  if [ "${BATIPANEL_ITERM_CC:-0}" = "1" ]; then
+  # attach to session (exec hands terminal directly to tmux)
+  # -CC mode only works in iTerm2 — ignore setting in other terminals
+  if [ "${BATIPANEL_ITERM_CC:-0}" = "1" ] && [ "${TERM_PROGRAM:-}" = "iTerm.app" ]; then
     exec tmux -CC attach -t "$SESSION"
   else
     exec tmux attach -t "$SESSION"

package/lib/shell-setup.sh

@@ -61,11 +61,16 @@ _generate_zsh_prompt() {
 _bp_env="$HOME/.batipanel/config/theme-env.sh"
 [[ -f "$_bp_env" ]] && source "$_bp_env"
 
-# set terminal colors via OSC sequences (skip Apple_Terminal — no OSC 10/11/12 support)
-if [[ "$TERM" != "dumb" ]] && [[ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]] && [[ -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"
+# set terminal colors
+if [[ "$TERM" != "dumb" ]] && [[ -n "${BP_BG:-}" ]]; then
+  if [[ "${TERM_PROGRAM:-}" == "Apple_Terminal" ]]; then
+    # Apple Terminal: colors are set via osascript at install/theme-change time
+    :
+  else
+    printf '\e]11;%s\a' "$BP_BG"
+    printf '\e]10;%s\a' "$BP_FG"
+    printf '\e]12;%s\a' "$BP_CURSOR"
+  fi
 fi
 
 autoload -U colors && colors
@@ -81,7 +86,10 @@ _bp_sep='>'
 case "${TERM_PROGRAM:-}" in
   iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _bp_sep=$'\uE0B0' ;;
 esac
-[[ -n "${TMUX:-}" ]] && _bp_sep=$'\uE0B0'
+# in tmux, only enable powerline if NOT Apple Terminal (glyphs may not render)
+if [[ -n "${TMUX:-}" ]] && [[ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]]; then
+  _bp_sep=$'\uE0B0'
+fi
 [[ "${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 "
@@ -130,7 +138,7 @@ _setup_default_bash_prompt() {
 _bp_env="$HOME/.batipanel/config/theme-env.sh"
 [ -f "$_bp_env" ] && source "$_bp_env"
 
-# set terminal colors via OSC (skip Apple_Terminal — no OSC 10/11/12 support)
+# set terminal colors (Apple Terminal uses osascript at install/theme-change time)
 if [[ "$TERM" != "dumb" ]] && [[ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]] && [[ -n "${BP_BG:-}" ]]; then
   printf '\e]11;%s\a' "$BP_BG"
   printf '\e]10;%s\a' "$BP_FG"
@@ -146,7 +154,8 @@ __batipanel_prompt() {
   case "${TERM_PROGRAM:-}" in
     iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _use_pl=1 ;;
   esac
-  [[ -n "${TMUX:-}" ]] && _use_pl=1
+  # in tmux, only enable powerline if NOT Apple Terminal
+  [[ -n "${TMUX:-}" ]] && [[ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]] && _use_pl=1
   [[ "${BATIPANEL_ICONS:-0}" == "1" ]] && _use_pl=1
   if (( _use_pl )); then
     sep=$'\uE0B0'

package/lib/themes-bash.sh

@@ -127,7 +127,7 @@ _generate_themed_prompt() {
 _bp_env="\$HOME/.batipanel/config/theme-env.sh"
 [ -f "\$_bp_env" ] && source "\$_bp_env"
 
-# set terminal colors via OSC sequences (skip Apple_Terminal — no OSC 10/11/12 support)
+# set terminal colors (Apple Terminal uses osascript at install/theme-change time)
 if [[ "\$TERM" != "dumb" ]] && [[ "\${TERM_PROGRAM:-}" != "Apple_Terminal" ]] && [[ -n "\${BP_BG:-}" ]]; then
   printf '\e]11;%s\a' "\$BP_BG"
   printf '\e]10;%s\a' "\$BP_FG"
@@ -143,7 +143,8 @@ __batipanel_prompt() {
   case "\${TERM_PROGRAM:-}" in
     iTerm.app|WezTerm|kitty|Hyper|Alacritty|vscode) _use_pl=1 ;;
   esac
-  [[ -n "\${TMUX:-}" ]] && _use_pl=1
+  # in tmux, only enable powerline if NOT Apple Terminal
+  [[ -n "\${TMUX:-}" ]] && [[ "\${TERM_PROGRAM:-}" != "Apple_Terminal" ]] && _use_pl=1
   [[ "\${BATIPANEL_ICONS:-0}" == "1" ]] && _use_pl=1
   if (( _use_pl )); then
     sep=\$'\\uE0B0'

package/lib/themes.sh

@@ -2,6 +2,44 @@
 # batipanel themes - color theme system (orchestrator)
 # Sub-modules: themes-data.sh, themes-tmux.sh, themes-bash.sh
 
+# apply theme colors to Apple Terminal via osascript
+_apply_apple_terminal_colors() {
+  local bg="$1" fg="$2" cursor="$3"
+  [[ "$bg" =~ ^# ]] || return 0
+  command -v osascript &>/dev/null || return 0
+
+  # convert hex #RRGGBB to AppleScript RGB {R*257, G*257, B*257}
+  _hex_to_as_rgb() {
+    local hex="${1#\#}"
+    local r=$((16#${hex:0:2}))
+    local g=$((16#${hex:2:2}))
+    local b=$((16#${hex:4:2}))
+    echo "$((r * 257)), $((g * 257)), $((b * 257))"
+  }
+
+  local bg_rgb fg_rgb cursor_rgb
+  bg_rgb=$(_hex_to_as_rgb "$bg")
+  fg_rgb=$(_hex_to_as_rgb "$fg")
+  cursor_rgb=$(_hex_to_as_rgb "$cursor")
+
+  # update batipanel profile if it exists (so new windows also get the colors)
+  # then apply to current window for immediate feedback
+  osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  if exists settings set "batipanel" then
+    set background color of settings set "batipanel" to {${bg_rgb}}
+    set normal text color of settings set "batipanel" to {${fg_rgb}}
+    set cursor color of settings set "batipanel" to {${cursor_rgb}}
+  end if
+  -- also apply to current window immediately
+  set w to front window
+  set background color of current settings of w to {${bg_rgb}}
+  set normal text color of current settings of w to {${fg_rgb}}
+  set cursor color of current settings of w to {${cursor_rgb}}
+end tell
+APPLESCRIPT
+}
+
 # apply theme: generate files, persist config, live reload
 # shellcheck disable=SC2153  # BATIPANEL_HOME is set by core.sh
 _apply_theme() {
@@ -47,13 +85,17 @@ _apply_theme() {
     tmux source-file "$BATIPANEL_HOME/config/theme.conf" 2>/dev/null || true
   fi
 
-  # live reload: apply terminal colors immediately via OSC
-  # (skip Apple_Terminal — no OSC 10/11/12 support)
-  if [[ "${TERM_PROGRAM:-}" != "Apple_Terminal" ]]; then
-    local term_colors
-    term_colors=$(_get_theme_terminal_colors "$theme")
-    local bg fg cursor
-    read -r bg fg cursor _ <<< "$term_colors"
+  # live reload: apply terminal colors immediately
+  local term_colors
+  term_colors=$(_get_theme_terminal_colors "$theme")
+  local bg fg cursor
+  read -r bg fg cursor _ <<< "$term_colors"
+
+  if [[ "${TERM_PROGRAM:-}" == "Apple_Terminal" ]]; then
+    # Apple Terminal: use osascript instead of OSC sequences
+    _apply_apple_terminal_colors "$bg" "$fg" "$cursor"
+  else
+    # other terminals: OSC 10/11/12
     printf '\e]11;%s\a' "$bg"
     printf '\e]10;%s\a' "$fg"
     printf '\e]12;%s\a' "$cursor"

package/package.json

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