batipanel 0.4.30 → 0.4.31

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.31

package/install.sh

@@ -648,11 +648,11 @@ else
   fi
 fi
 
-# === 9b. install Nerd Font + recommend iTerm2 (macOS) ===
+# === 9b. install Nerd Font + configure terminal (macOS) ===
 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,19 +660,55 @@ if [ "$OS" = "Darwin" ]; then
     fi
   fi
 
-  # recommend iTerm2 if not installed and user is on Apple Terminal
+  # auto-configure Apple Terminal: font + theme colors via osascript
   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"
+    # detect current profile name
+    _term_profile=$(defaults read com.apple.Terminal "Default Window Settings" 2>/dev/null || echo "Basic")
+
+    # set Nerd Font on the profile
+    echo "  Configuring Apple Terminal font (MesloLGS NF)..."
+    osascript -e "tell application \"Terminal\" to set font name of settings set \"${_term_profile}\" to \"MesloLGS-NF-Regular\"" 2>/dev/null || true
+    osascript -e "tell application \"Terminal\" to set font size of settings set \"${_term_profile}\" to 13" 2>/dev/null || true
+
+    # apply theme colors to Terminal.app profile
+    _apply_terminal_app_colors() {
+      local theme="${1:-default}"
+      local term_colors
+      if declare -f _get_theme_terminal_colors &>/dev/null; then
+        term_colors=$(_get_theme_terminal_colors "$theme")
       else
-        echo "  https://iterm2.com/downloads.html"
+        term_colors="#1e1e2e #cdd6f4 #f5e0dc blue cyan green magenta"
       fi
-    else
-      echo "iTerm2 is installed. Use iTerm2 for the best experience."
-    fi
+      local bg fg cursor
+      read -r bg fg cursor _ <<< "$term_colors"
+
+      # convert hex #RRGGBB to AppleScript RGB {R*257, G*257, B*257}
+      _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))"
+      }
+
+      if [[ "$bg" =~ ^# ]]; then
+        local bg_rgb fg_rgb cursor_rgb
+        bg_rgb=$(_hex_to_applescript_rgb "$bg")
+        fg_rgb=$(_hex_to_applescript_rgb "$fg")
+        cursor_rgb=$(_hex_to_applescript_rgb "$cursor")
+        local profile="$_term_profile"
+        osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  set background color of settings set "$profile" to {${bg_rgb}}
+  set normal text color of settings set "$profile" to {${fg_rgb}}
+  set cursor color of settings set "$profile" to {${cursor_rgb}}
+end tell
+APPLESCRIPT
+      fi
+    }
+
+    _apply_terminal_app_colors "${BATIPANEL_THEME:-default}"
+    echo "  Applied theme colors to Apple Terminal profile (${_term_profile})"
   fi
 fi
 
@@ -745,24 +781,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: font and theme colors have been configured automatically."
   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)"

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
@@ -130,7 +135,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"

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"

package/lib/themes.sh

@@ -2,6 +2,37 @@
 # 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 profile
+  profile=$(defaults read com.apple.Terminal "Default Window Settings" 2>/dev/null || echo "Basic")
+  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")
+
+  osascript <<APPLESCRIPT 2>/dev/null || true
+tell application "Terminal"
+  set background color of settings set "$profile" to {${bg_rgb}}
+  set normal text color of settings set "$profile" to {${fg_rgb}}
+  set cursor color of settings set "$profile" 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 +78,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.31",
   "description": "AI-powered terminal workspace manager — multi-panel tmux layouts with Claude Code, git, monitoring, and more",
   "bin": {
     "batipanel": "./bin/cli.sh"