batipanel 0.4.21 → 0.4.25

package/README.md

@@ -118,13 +118,12 @@ b server start    # Docker 서버 시작 — 끝!
 
 ```bash
 # Install (pick one)
-npx batipanel                                      # npm/npx
-brew install batiai/tap/batipanel                   # Homebrew
-curl -fsSL https://batipanel.com/install.sh | bash  # Shell script (domain)
-curl -fsSL https://raw.githubusercontent.com/batiai/batipanel/master/scripts/web-install.sh | bash  # Shell script (GitHub)
+curl -fsSL https://batipanel.com/install.sh | bash  # Recommended
+npx batipanel                                       # npm/npx
+brew install batiai/tap/batipanel                    # Homebrew
 
 # Run — the setup wizard guides you through everything
-batipanel
+b
 ```
 
 That's it. The wizard asks 2 questions (screen size + workflow) and sets up your workspace.
@@ -144,25 +143,17 @@ That's it. The wizard asks 2 questions (screen size + workflow) and sets up your
 
 2. **설치 명령어 실행** (복사 후 붙여넣기):
    ```bash
-   git clone https://github.com/batiai/batipanel.git
-   cd batipanel
-   bash install.sh
+   curl -fsSL https://batipanel.com/install.sh | bash
    ```
-   - tmux가 없으면 설치 방법을 안내합니다 (Homebrew, MacPorts, Nix 등)
-   - 비밀번호를 물어보면 Mac 로그인 비밀번호 입력
+   - tmux, 기타 도구를 자동으로 설치합니다
+   - Homebrew가 없으면 안내를 따르세요
 
 3. **새 터미널 열기** 후 실행:
    ```bash
    b
    ```
 
-> **npm/npx로 설치하고 싶다면**: 먼저 [nvm](https://github.com/nvm-sh/nvm)을 설치하세요:
-> ```bash
-> curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
-> source ~/.zshrc
-> nvm install --lts
-> npx batipanel
-> ```
+> **다른 설치 방법**: `npx batipanel` (Node.js 필요) 또는 `brew install batiai/tap/batipanel` (Homebrew)
 
 </details>
 
@@ -173,9 +164,7 @@ That's it. The wizard asks 2 questions (screen size + workflow) and sets up your
 
 2. **설치 명령어 실행**:
    ```bash
-   git clone https://github.com/batiai/batipanel.git
-   cd batipanel
-   bash install.sh
+   curl -fsSL https://batipanel.com/install.sh | bash
    ```
    - 모든 도구(tmux, btop 등)가 자동 설치됩니다
 
@@ -184,13 +173,7 @@ That's it. The wizard asks 2 questions (screen size + workflow) and sets up your
    b
    ```
 
-> **npm/npx로 설치하고 싶다면**: 먼저 [nvm](https://github.com/nvm-sh/nvm)을 설치하세요:
-> ```bash
-> curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
-> source ~/.bashrc
-> nvm install --lts
-> npx batipanel
-> ```
+> **다른 설치 방법**: `npx batipanel` (Node.js 필요) 또는 수동 설치: `git clone https://github.com/batiai/batipanel.git && cd batipanel && bash install.sh`
 
 </details>
 
@@ -219,7 +202,7 @@ All dependencies (tmux, lazygit, btop, yazi, eza) are installed automatically.
 
 ```bash
 # One-line install (no npm/Node.js required)
-curl -fsSL https://raw.githubusercontent.com/batiai/batipanel/master/scripts/web-install.sh | bash
+curl -fsSL https://batipanel.com/install.sh | bash
 ```
 
 Or clone and install manually:

package/VERSION

@@ -1 +1 @@
-0.4.21
+0.4.25

package/bin/start.sh

@@ -24,6 +24,7 @@ show_help() {
   echo "  b config layout [name]               Set default layout"
   echo "  b theme [name]                       Change color theme"
   echo "  b doctor                             Check system health"
+  echo "  b reset                              Kill tmux, clear projects, re-test"
   echo "  b server [init|start|stop|status]    AI server (Telegram bot)"
   echo "  b help                               Show this help"
   echo ""
@@ -106,6 +107,9 @@ case "${ARGS[0]:-}" in
   doctor)
     tmux_doctor
     ;;
+  reset)
+    tmux_reset
+    ;;
   server)
     server_cmd "${ARGS[1]:-}" "${ARGS[2]:-}" "${ARGS[3]:-}"
     ;;

package/config/tmux-powerline.conf

@@ -0,0 +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]'

package/config/tmux.conf

@@ -1,8 +1,15 @@
 # batipanel tmux configuration
+# NOTE: no if-shell commands — platform settings are in tmux-platform.conf
 
 # === terminal & color support ===
-set -g default-terminal "tmux-256color"
+set -g default-terminal "xterm-256color"
 set -as terminal-overrides ",xterm*:RGB"
+set -sg escape-time 10
+set -g focus-events on
+
+# prevent window/pane names from cycling through running commands
+setw -g automatic-rename off
+set -g allow-rename off
 
 # enable mouse (click, drag, scroll, resize)
 set -g mouse on
@@ -11,29 +18,25 @@ set -g mouse on
 set -g base-index 1
 setw -g pane-base-index 1
 
-# === status bar - powerline style ===
+# === status bar ===
 set -g status-position bottom
 set -g status-style "bg=colour234,fg=colour137"
-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 '
 set -g status-left-length 30
 set -g status-right-length 50
-
-# window status - powerline style
-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=colour249,bg=colour240] #{session_windows}W #{window_panes}P #[fg=colour232,bg=colour2,bold] %H:%M %m-%d '
+setw -g window-status-format '#[fg=colour249,bg=colour238] #I #W #[fg=colour238,bg=colour234]|'
+setw -g window-status-current-format '#[fg=colour255,bg=colour33,bold] #I #W #[fg=colour33,bg=colour234]|'
 
 # === pane borders ===
 set -g pane-border-style "fg=colour240"
 set -g pane-active-border-style "fg=colour2,bold"
-
-# pane labels (show tool name in border)
 set -g pane-border-status top
 set -g pane-border-format "#[fg=colour240] #{pane_index}:#{pane_title} "
 
 # === terminal title ===
 set -g set-titles on
-set -g set-titles-string "batipanel • #S:#W"
+set -g set-titles-string "batipanel - #S:#W"
 
 # === messages ===
 set -g display-time 2000
@@ -41,7 +44,6 @@ set -g message-style "bg=colour33,fg=colour255,bold"
 set -g message-command-style "bg=colour33,fg=colour255"
 
 # === pane navigation ===
-# Alt+hjkl or Alt+arrow: move between panes
 bind -n M-Left select-pane -L
 bind -n M-Right select-pane -R
 bind -n M-Up select-pane -U
@@ -50,50 +52,34 @@ bind -n M-h select-pane -L
 bind -n M-l select-pane -R
 bind -n M-k select-pane -U
 bind -n M-j select-pane -D
-
-# Alt+Space: toggle last pane
 bind -n M-Space select-pane -l
-
-# Alt+f: zoom/focus current pane (toggle)
 bind -n M-f resize-pane -Z
 
 # === pane swapping ===
-# Alt+Shift+hjkl: swap pane in direction
 bind -n M-H swap-pane -s '{left-of}'
 bind -n M-L swap-pane -s '{right-of}'
 bind -n M-K swap-pane -s '{up-of}'
 bind -n M-J swap-pane -s '{down-of}'
 
 # === pane resizing ===
-# prefix+arrow: resize by 5 units
 bind -r Left resize-pane -L 5
 bind -r Right resize-pane -R 5
 bind -r Up resize-pane -U 3
 bind -r Down resize-pane -D 3
-
-# Alt+Shift+arrow: fine resize (1 unit)
 bind -n M-S-Left resize-pane -L 1
 bind -n M-S-Right resize-pane -R 1
 bind -n M-S-Up resize-pane -U 1
 bind -n M-S-Down resize-pane -D 1
-
-# prefix+=: equalize all pane sizes
 bind = select-layout -E
 
 # === quick splits ===
-# Alt+\: vertical split, Alt+-: horizontal split (keep current path)
 bind -n M-\\ split-window -h -c "#{pane_current_path}"
 bind -n M-- split-window -v -c "#{pane_current_path}"
 
 # === window management ===
-# Alt+n: new window
 bind -n M-n new-window -c "#{pane_current_path}"
-
-# Alt+[/]: previous/next window
 bind -n M-[ previous-window
 bind -n M-] next-window
-
-# Alt+1~9: direct window select
 bind -n M-1 select-window -t 1
 bind -n M-2 select-window -t 2
 bind -n M-3 select-window -t 3
@@ -103,8 +89,6 @@ bind -n M-6 select-window -t 6
 bind -n M-7 select-window -t 7
 bind -n M-8 select-window -t 8
 bind -n M-9 select-window -t 9
-
-# Alt+x: kill pane (with confirm)
 bind -n M-x confirm-before -p "Kill pane? (y/n)" kill-pane
 
 # === copy mode (vi style) ===
@@ -113,29 +97,13 @@ bind -T copy-mode-vi v send-keys -X begin-selection
 bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
 bind -T copy-mode-vi Escape send-keys -X cancel
 
-# clipboard integration (copy-mode → system clipboard)
-# macOS
-if-shell "uname -s | grep -q Darwin" \
-  "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'pbcopy'"
-# WSL
-if-shell "grep -qi microsoft /proc/version 2>/dev/null" \
-  "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'clip.exe'"
-# Linux (X11/Wayland)
-if-shell "command -v xclip >/dev/null 2>&1" \
-  "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -selection clipboard'"
-
 # === session management ===
 bind s choose-session -ZN
 bind S new-session -c "#{pane_current_path}"
-
-# Reload config
 bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded"
 
 # scroll history
 set -g history-limit 10000
 
-# Use the user's default shell
-set -g default-shell "$SHELL"
-
-# theme overlay (generated by 'b theme')
-if-shell "test -f ~/.batipanel/config/theme.conf" "source-file ~/.batipanel/config/theme.conf"
+# platform-specific settings (generated by install.sh — clipboard, shell, theme)
+source-file ~/.batipanel/config/tmux-platform.conf

package/install.sh

@@ -138,10 +138,45 @@ fi
 if ! command -v tmux &>/dev/null; then
   echo ""
   echo "tmux is required but could not be installed."
-  echo "Please install tmux manually and re-run this installer."
+  if [ "$OS" = "Darwin" ]; then
+    echo "Install via Homebrew:  brew install tmux"
+  else
+    echo "Install via package manager:  sudo apt install tmux  (or equivalent)"
+  fi
   exit 1
 fi
 
+# smoke test: verify tmux can actually start a server
+_tmux_smoke_ok=0
+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
+fi
+
+if [ "$_tmux_smoke_ok" = "0" ]; then
+  echo ""
+  echo "WARNING: tmux is installed but fails to start (server exited unexpectedly)."
+  # if mamba tmux exists, it may be the broken one — remove wrapper so brew takes priority
+  if [ -f "$BATIPANEL_HOME/bin/tmux" ] && [ -d "$BATIPANEL_HOME/.mamba" ]; then
+    echo "  Removing unstable conda-forge tmux..."
+    rm -f "$BATIPANEL_HOME/bin/tmux"
+  fi
+  if [ "$OS" = "Darwin" ]; then
+    echo "  Please install tmux via Homebrew:  brew install tmux"
+  else
+    echo "  Please install tmux via package manager:  sudo apt install 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
+    tmux kill-session -t _bp_smoke2 2>/dev/null || true
+    echo "  Found working system tmux: $(tmux -V)"
+  else
+    echo ""
+    echo "tmux is required. Install it and re-run this installer."
+    exit 1
+  fi
+fi
+
 # ensure git >= 2.32 (required by lazygit)
 if has_cmd git; then
   GIT_VER=$(git --version | grep -oE '[0-9]+\.[0-9]+' | head -1)
@@ -431,24 +466,64 @@ fi
 # === 6. install tmux.conf ===
 mkdir -p "$BATIPANEL_HOME/config"
 cp "$SCRIPT_DIR/config/tmux.conf" "$BATIPANEL_HOME/config/tmux.conf"
+cp "$SCRIPT_DIR/config/tmux-powerline.conf" "$BATIPANEL_HOME/config/tmux-powerline.conf" 2>/dev/null || true
+
+# generate platform-specific config (no if-shell needed — detected at install time)
+_PLATFORM_CONF="$BATIPANEL_HOME/config/tmux-platform.conf"
+{
+  echo "# batipanel platform config (auto-generated by install.sh)"
+  echo ""
 
+  # clipboard
+  case "$OS" in
+    Darwin)
+      echo "# macOS clipboard"
+      echo "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'pbcopy'"
+      ;;
+    *)
+      if command -v xclip &>/dev/null; then
+        echo "# Linux clipboard (xclip)"
+        echo "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -selection clipboard'"
+      elif grep -qi microsoft /proc/version 2>/dev/null; then
+        echo "# WSL clipboard"
+        echo "bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'clip.exe'"
+      fi
+      ;;
+  esac
+
+  # default shell
+  local_shell="${SHELL:-}"
+  if [ -n "$local_shell" ] && [ -x "$local_shell" ]; then
+    echo ""
+    echo "# user shell"
+    echo "set -g default-shell \"$local_shell\""
+  fi
+
+  echo ""
+  echo "# theme overlay (generated by 'b theme')"
+  echo "source-file $BATIPANEL_HOME/config/theme.conf"
+} > "$_PLATFORM_CONF"
+echo "  Generated platform config"
+
+# guarantee theme.conf exists (empty = no theme = default tmux colors)
+if [ ! -f "$BATIPANEL_HOME/config/theme.conf" ]; then
+  echo "# batipanel theme (auto-generated, use 'b theme' to change)" > "$BATIPANEL_HOME/config/theme.conf"
+fi
+
+# kill stale tmux server so new config takes effect
+tmux kill-server 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"
 if [ -f ~/.tmux.conf ]; then
-  if ! grep -qF "$BATIPANEL_SOURCE_LINE" ~/.tmux.conf 2>/dev/null; then
-    {
-      echo ""
-      echo "# batipanel"
-      echo "$BATIPANEL_SOURCE_LINE"
-    } >> ~/.tmux.conf
-    echo "  Added batipanel source line to ~/.tmux.conf"
-  else
-    echo "  ~/.tmux.conf already configured"
-  fi
-else
-  echo "# batipanel" > ~/.tmux.conf
-  echo "$BATIPANEL_SOURCE_LINE" >> ~/.tmux.conf
-  echo "  Created ~/.tmux.conf with batipanel source"
+  sed_i '/batipanel/d' ~/.tmux.conf 2>/dev/null || true
 fi
+{
+  echo ""
+  echo "# batipanel"
+  echo "$BATIPANEL_SOURCE_LINE"
+} >> ~/.tmux.conf
+echo "  Configured ~/.tmux.conf"
 
 # === 7. register aliases ===
 # detect user's login shell via $SHELL (not $BASH_VERSION which reflects the script interpreter)
@@ -480,7 +555,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 local _pf=\"$BATIPANEL_HOME/config/bash-prompt.sh\"; [ -f \"\$_pf\" ] && source \"\$_pf\"; fi; }"
+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; }"
 
 # Always register 'batipanel' alias
 if grep -q "alias batipanel=" "$SHELL_RC" 2>/dev/null; then

package/lib/doctor.sh

@@ -17,7 +17,23 @@ tmux_doctor() {
     ver=$(tmux -V 2>/dev/null | grep -oE '[0-9]+\.[0-9]+' | head -1)
     local major="${ver%%.*}" minor="${ver#*.}"
     if [[ -n "$ver" ]] && (( major >= 2 && (major > 2 || minor >= 6) )); then
-      echo -e "  [$ok]  tmux $ver"
+      # functional test: actually create and destroy a test session
+      local test_sess="_bp_doctor_test_$$"
+      local tmux_test_err
+      if tmux_test_err=$(tmux new-session -d -s "$test_sess" -x 10 -y 5 2>&1); then
+        tmux kill-session -t "$test_sess" 2>/dev/null
+        echo -e "  [$ok]  tmux $ver (functional)"
+      else
+        echo -e "  [$fail]  tmux $ver installed but cannot create sessions"
+        if [[ "$tmux_test_err" == *"open terminal failed"* ]]; then
+          echo "          terminfo issue — try: export TERM=xterm-256color"
+        elif [[ "$tmux_test_err" == *"library"* ]] || [[ "$tmux_test_err" == *"dylib"* ]]; then
+          echo "          library issue — try reinstalling tmux"
+        else
+          echo "          error: $tmux_test_err"
+        fi
+        issues=$((issues + 1))
+      fi
     else
       echo -e "  [$fail]  tmux ${ver:-unknown} (need 2.6+)"
       issues=$((issues + 1))
@@ -107,7 +123,7 @@ tmux_doctor() {
   # 9. tab completion
   local comp_found=0
   for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile"; do
-    if [ -f "$rc" ] && grep -q "completions/batipanel" "$rc" 2>/dev/null; then
+    if [ -f "$rc" ] && grep -qE "(completions/batipanel|_batipanel|\.zfunc)" "$rc" 2>/dev/null; then
       comp_found=1
       break
     fi

package/lib/layout.sh

@@ -16,16 +16,35 @@ init_layout() {
   # tmux auto-resizes to actual terminal dimensions on attach.
   debug_log "init_layout: session=$session project=$project"
   tmux kill-session -t "$session" 2>/dev/null || true
-  if ! tmux new-session -d -s "$session" -c "$project" -x 220 -y 60; then
-    # 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}"
-    echo "  Is another tmux server blocking? Try: tmux kill-server"
-    return 1
-  fi
+
+  # try creating session; capture stderr for debug output
+  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
+    }
+  }
 }
 
 # Wait for shell init after pane splits
@@ -156,8 +175,16 @@ load_layout() {
 
   debug_log "load_layout: $layout_file"
 
+  # temporarily disable errexit so partial split failures don't kill the session
+  set +e
   # shellcheck source=/dev/null
   source "$layout_file" "$session" "$project"
+  local rc=$?
+  set -e
+
+  if [ "$rc" -ne 0 ]; then
+    debug_log "load_layout: layout exited with code $rc (partial setup possible)"
+  fi
 }
 
 # List available layouts

package/lib/session.sh

@@ -1,6 +1,19 @@
 #!/usr/bin/env bash
 # batipanel session - start, stop, list, project listing
 
+# portable timeout: timeout → gtimeout → perl fallback
+_tmux_timeout() {
+  local secs="$1"; shift
+  if command -v timeout &>/dev/null; then
+    timeout "$secs" "$@"
+  elif command -v gtimeout &>/dev/null; then
+    gtimeout "$secs" "$@"
+  else
+    # perl is always available on macOS/Linux
+    perl -e "alarm $secs; exec @ARGV" -- "$@"
+  fi
+}
+
 tmux_start() {
   local SESSION="$1"
   local LAYOUT="${2:-}"
@@ -15,16 +28,33 @@ tmux_start() {
     return 1
   fi
 
-  if tmux has-session -t "$SESSION" 2>/dev/null; then
+  if _tmux_timeout 3 tmux has-session -t "$SESSION" 2>/dev/null; then
     log_info "session resume: $SESSION"
     echo -e "${GREEN}Resuming session: $SESSION${NC}"
   else
     log_info "session start: $SESSION layout=${LAYOUT:-$DEFAULT_LAYOUT}"
     echo -e "${BLUE}Starting new session: $SESSION${NC}"
-    if [ -n "$LAYOUT" ]; then
-      LAYOUT="$LAYOUT" bash "$SCRIPT" "$SESSION"
-    else
-      bash "$SCRIPT" "$SESSION"
+    # run project script (creates tmux session + panes)
+    local script_err
+    set +e
+    script_err=$(bash "$SCRIPT" "$SESSION" 2>&1)
+    set -e
+
+    # verify session was actually created
+    if ! _tmux_timeout 3 tmux has-session -t "$SESSION" 2>/dev/null; then
+      echo -e "${RED}Failed to start session '$SESSION'${NC}"
+      if [ -n "$script_err" ]; then
+        echo -e "${YELLOW}Error output:${NC}"
+        echo "$script_err" | head -20
+      fi
+      echo ""
+      echo "Troubleshooting:"
+      echo "  1. Run: b doctor                  (check tmux installation)"
+      echo "  2. Run: tmux new-session -d -s test && tmux kill-session -t test"
+      echo "     (test if tmux works at all)"
+      echo "  3. Run: b reset                   (clean up stale state)"
+      echo "  4. Try: export TERM=xterm-256color && b $SESSION"
+      return 1
     fi
   fi
 
@@ -48,6 +78,8 @@ tmux_start() {
     _save_config "BATIPANEL_ITERM_CC" "$BATIPANEL_ITERM_CC"
   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
     exec tmux -CC attach -t "$SESSION"
   else
@@ -60,7 +92,7 @@ tmux_stop() {
   local FORCE="${2:-}"
   validate_session_name "$SESSION" || return 1
 
-  if tmux has-session -t "$SESSION" 2>/dev/null; then
+  if _tmux_timeout 3 tmux has-session -t "$SESSION" 2>/dev/null; then
     if [[ "$FORCE" != "-f" && -t 0 ]]; then
       printf "Stop session '%s'? [y/N] " "$SESSION"
       local answer
@@ -78,12 +110,79 @@ tmux_stop() {
 
 tmux_list() {
   echo -e "${BLUE}=== Active Sessions ===${NC}"
-  tmux ls 2>/dev/null || echo "  (none)"
+  # run tmux ls with 3s timeout to avoid hang on stale server
+  local tmux_out
+  if tmux_out=$(_tmux_timeout 3 tmux ls 2>/dev/null); then
+    echo "$tmux_out"
+  else
+    echo "  (none)"
+  fi
   echo ""
   echo -e "${BLUE}=== Registered Projects ===${NC}"
   list_projects
 }
 
+tmux_reset() {
+  echo ""
+  echo -e "${YELLOW}=== batipanel reset ===${NC}"
+  echo ""
+
+  # 1. kill tmux server
+  echo "  Killing tmux server..."
+  tmux kill-server 2>/dev/null && echo "    Done" || echo "    No server running"
+
+  # 2. remove stale sockets
+  local socket_dir="${TMUX_TMPDIR:-${TMPDIR:-/tmp}}"
+  local cleaned=0
+  for sock in "$socket_dir"/tmux-"$(id -u)"/*; do
+    [ -e "$sock" ] || continue
+    rm -f "$sock" 2>/dev/null && cleaned=$((cleaned + 1))
+  done
+  if (( cleaned > 0 )); then
+    echo "  Removed $cleaned stale socket(s)"
+  fi
+
+  # 3. remove registered projects
+  local proj_count=0
+  for f in "$BATIPANEL_HOME"/projects/*.sh; do
+    [ -f "$f" ] || continue
+    proj_count=$((proj_count + 1))
+  done
+  if (( proj_count > 0 )); then
+    rm -f "$BATIPANEL_HOME"/projects/*.sh
+    echo "  Removed $proj_count registered project(s)"
+  fi
+
+  # 4. remove config (wizard will re-run)
+  if [ -f "$BATIPANEL_HOME/config.sh" ]; then
+    rm -f "$BATIPANEL_HOME/config.sh"
+    echo "  Removed config.sh (wizard will re-run)"
+  fi
+
+  # 5. test tmux
+  echo ""
+  echo "  Testing tmux..."
+  local test_sess="_bp_reset_test_$$"
+  local test_err
+  if test_err=$(tmux new-session -d -s "$test_sess" -x 10 -y 5 2>&1); then
+    tmux kill-session -t "$test_sess" 2>/dev/null
+    echo -e "  ${GREEN}tmux is working!${NC}"
+  else
+    echo -e "  ${RED}tmux cannot create sessions${NC}"
+    echo "  Error: $test_err"
+    echo ""
+    echo "  Possible fixes:"
+    echo "    export TERM=xterm-256color"
+    echo "    brew reinstall tmux        (if using Homebrew)"
+    echo "    rm -rf ~/.batipanel/.mamba  (if using micromamba tmux)"
+  fi
+
+  echo ""
+  echo -e "${GREEN}Reset complete.${NC} Now try:"
+  echo "  cd ~/your-project && b"
+  echo ""
+}
+
 # list registered projects
 list_projects() {
   local found=0

package/lib/shell-setup.sh

@@ -61,15 +61,22 @@ _generate_zsh_prompt() {
 _bp_env="$HOME/.batipanel/config/theme-env.sh"
 [[ -f "$_bp_env" ]] && source "$_bp_env"
 
+# set terminal colors via OSC sequences
+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
+
 autoload -U colors && colors
 autoload -Uz vcs_info
 setopt PROMPT_SUBST
 
 precmd() { vcs_info }
-zstyle ':vcs_info:git:*' formats ' %F{green}(%b)%f'
+zstyle ':vcs_info:git:*' formats " %F{${BP_C_GIT:-green}}(%b)%f"
 zstyle ':vcs_info:*' enable git
 
-PROMPT='%F{blue}%n%f %F{cyan}%~%f${vcs_info_msg_0_} %F{magenta}>%f '
+PROMPT="%F{${BP_C_USER:-blue}}%n%f %F{${BP_C_DIR:-cyan}}%~%f\${vcs_info_msg_0_} %F{${BP_C_PROMPT:-magenta}}>%f "
 RPROMPT='%(?..%F{red}[%?]%f)'
 ZSH_PROMPT_EOF
 }

package/lib/themes-bash.sh

@@ -118,16 +118,47 @@ _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|Hyper|Alacritty|vscode) use_powerline=1 ;;
+  esac
+  # inside tmux, TERM_PROGRAM is not passed through;
+  # batipanel's tmux status bar always uses powerline glyphs,
+  # so the terminal must support them — enable for bash prompt too
+  [[ -n "${TMUX:-}" ]] && use_powerline=1
+  [[ "${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
 # batipanel bash prompt - theme: ${theme} (auto-generated)
 
+# load theme colors for OSC
+_bp_env="\$HOME/.batipanel/config/theme-env.sh"
+[ -f "\$_bp_env" ] && source "\$_bp_env"
+
+# set terminal colors via OSC sequences
+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=\$?
 
-  # powerline arrow symbols (U+E0B0, U+E0B1)
-  local sep=\$'\\uE0B0'
+  # glyph (powerline arrow or ASCII fallback)
+  local sep="${sep_char}"
 
   # colors (generated from theme: ${theme})
   local bg_user="${bg_user}"
@@ -167,8 +198,12 @@ __batipanel_prompt() {
 
   if [ -n "\$git_branch" ]; then
     ps+="\${t_dir_git}\${sep}"
-    local git_icon=\$'\\uE0A0'
-    ps+="\${bg_git}\${fg_git} \${git_icon} \${git_branch} "
+${git_icon_line}
+    if [ -n "\$git_icon" ]; then
+      ps+="\${bg_git}\${fg_git} \${git_icon} \${git_branch} "
+    else
+      ps+="\${bg_git}\${fg_git} \${git_branch} "
+    fi
     ps+="\${reset}\${t_git_end}\${sep}\${reset} "
   else
     ps+="\${reset}\${t_dir_end}\${sep}\${reset} "

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/lib/themes.sh

@@ -26,6 +26,11 @@ _apply_theme() {
     generate_theme_env "$theme"
   fi
 
+  # regenerate zsh prompt file with new theme colors
+  if declare -f _generate_zsh_prompt &>/dev/null; then
+    _generate_zsh_prompt
+  fi
+
   # persist to config.sh
   if [ -f "$TMUX_CONFIG" ]; then
     if grep -qF "BATIPANEL_THEME=" "$TMUX_CONFIG"; then
@@ -53,7 +58,7 @@ _apply_theme() {
 
   log_info "theme applied: $theme"
   echo -e "${GREEN}Theme applied: ${theme}${NC}"
-  echo "  Terminal colors updated. Run: source ~/.zshrc  (for prompt colors)"
+  echo "  Terminal and prompt colors updated."
 }
 
 # CLI entry point: b theme [name]

package/lib/wizard.sh

@@ -82,6 +82,13 @@ run_wizard() {
   cwd=$(pwd)
   proj_name=$(basename "$cwd" | tr -c 'a-zA-Z0-9_-' '-' | sed 's/-*$//')
 
+  # warn if current directory looks like a temp/clone directory
+  if [[ "$cwd" == /tmp/* ]] || [[ "$cwd" == /private/tmp/* ]] || { [[ "$cwd" == */batipanel ]] && [[ -f "$cwd/install.sh" ]]; }; then
+    echo -e "${YELLOW}Warning:${NC} Current directory looks like a temporary or installer path."
+    echo -e "  You probably want to cd to your actual project directory first."
+    echo ""
+  fi
+
   echo -e "Register ${BLUE}${cwd}${NC} as project '${GREEN}${proj_name}${NC}'?"
   printf "[Y/n] "
   read -r reg_answer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "batipanel",
-  "version": "0.4.21",
+  "version": "0.4.25",
   "description": "AI-powered terminal workspace manager — multi-panel tmux layouts with Claude Code, git, monitoring, and more",
   "bin": {
     "batipanel": "./bin/cli.sh"
@@ -24,7 +24,7 @@
     "type": "git",
     "url": "git+https://github.com/batiai/batipanel.git"
   },
-  "homepage": "https://github.com/batiai/batipanel",
+  "homepage": "https://batipanel.com",
   "bugs": {
     "url": "https://github.com/batiai/batipanel/issues"
   },

package/uninstall.sh

@@ -48,23 +48,36 @@ if [ -f "$HOME/.tmux.conf" ]; then
   fi
 fi
 
-# 3. remove shell aliases and completion source lines
+# 3. remove ALL batipanel lines from shell RC files
 for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.bash_profile" "$HOME/.profile"; do
   [ -f "$rc" ] || continue
-  if grep -q "batipanel" "$rc" 2>/dev/null; then
+  if grep -qE "(batipanel|\.batipanel)" "$rc" 2>/dev/null; then
     _sed_i '/# batipanel/d' "$rc"
     _sed_i '/alias batipanel=/d' "$rc"
     _sed_i '/alias b=.*batipanel/d' "$rc"
+    # b() function (may span one line)
+    _sed_i '/b().*batipanel/d' "$rc"
+    # prompt source lines
+    _sed_i '/bash-prompt\.sh/d' "$rc"
+    _sed_i '/zsh-prompt\.zsh/d' "$rc"
+    _sed_i '/# batipanel shell theme/d' "$rc"
+    _sed_i '/# batipanel prompt theme/d' "$rc"
+    # completion lines
     _sed_i '/completions\/batipanel/d' "$rc"
-    echo "  Cleaned aliases and completions from $(basename "$rc")"
+    _sed_i '/_batipanel/d' "$rc"
+    # PATH additions
+    _sed_i '/\.batipanel\/bin/d' "$rc"
+    # clean up blank lines left behind (collapse multiple empty lines to one)
+    _sed_i '/^[[:space:]]*$/{ N; /^\n[[:space:]]*$/d; }' "$rc"
+    echo "  Cleaned all batipanel entries from $(basename "$rc")"
   fi
 done
 
 # remove zsh completion from fpath
 local_zsh_comp="${ZDOTDIR:-$HOME}/.zfunc"
-if [ -f "$local_zsh_comp/_batipanel" ]; then
-  rm -f "$local_zsh_comp/_batipanel"
-  echo "  Removed zsh completion"
+rm -f "$local_zsh_comp/_batipanel" "$local_zsh_comp/_b" 2>/dev/null
+if [ -d "$local_zsh_comp" ]; then
+  echo "  Removed zsh completions from .zfunc"
 fi
 
 # 4. stop server containers (if running)