@walwal-harness/cli 5.0.2 → 5.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walwal-harness/cli",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Production harness for AI agent engineering — Solo/Team mode, Planner, Generator(BE/FE), Evaluator(Func/Visual), optional Brainstormer. Supports React, Next.js, and Flutter FE stacks.",
   "bin": {
     "walwal-harness": "bin/init.js"

package/scripts/harness-dashboard.sh

@@ -316,6 +316,46 @@ render_team_bottleneck() {
   fi
 }
 
+# ══════════════════════════════════════════
+# Archive Prompt — 처리 완료된 프롬프트 목록
+# ══════════════════════════════════════════
+render_archive_prompts() {
+  if [ ! -f "$PROGRESS_LOG" ]; then return; fi
+
+  # user-prompt 엔트리 중 이후에 result/pass/completed 액션이 있는 것 = 처리 완료
+  local all_prompts
+  all_prompts=$(grep '| user-prompt |' "$PROGRESS_LOG" 2>/dev/null)
+  if [ -z "$all_prompts" ]; then return; fi
+
+  local total_prompts
+  total_prompts=$(echo "$all_prompts" | wc -l | tr -d ' ')
+
+  # 마지막 프롬프트를 제외한 모든 프롬프트 = archived (처리 완료)
+  local archived
+  if [ "$total_prompts" -le 1 ]; then return; fi
+  archived=$(echo "$all_prompts" | head -n $((total_prompts - 1)) | tail -8)
+
+  echo ""
+  echo -e "${BOLD}Archive Prompt${RESET}  ${DIM}(처리 완료)${RESET}"
+
+  echo "$archived" | while IFS= read -r line; do
+    local ts detail
+    ts=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$1); print $1}')
+    detail=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$4); print $4}')
+
+    local short_ts
+    short_ts=$(echo "$ts" | grep -oE '[0-9]{2}:[0-9]{2}' | tail -1 || echo "$ts")
+
+    if [ ${#detail} -gt 45 ]; then detail="${detail:0:43}.."; fi
+
+    echo -e "  ${GREEN}✓${RESET} ${DIM}${short_ts}${RESET}  ${detail}"
+  done
+
+  if [ "$total_prompts" -gt 9 ]; then
+    echo -e "  ${DIM}… +$((total_prompts - 9)) more${RESET}"
+  fi
+}
+
 # ══════════════════════════════════════════
 # Render dispatch
 # ══════════════════════════════════════════
@@ -331,6 +371,7 @@ render_dashboard() {
       render_team_status
       render_team_features
       render_team_bottleneck
+      render_archive_prompts
       ;;
     *)
       render_solo_sprint_overview
@@ -341,8 +382,7 @@ render_dashboard() {
       fi
 
       render_solo_agent_info
-      echo ""
-      render_solo_prompt_history
+      render_archive_prompts
       ;;
   esac
 }

package/scripts/harness-prompt-history.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-# harness-prompt-history.sh — Prompt History pane for tmux layout
-# progress.log + audit.log에서 유저 프롬프트/에이전트 활동 히스토리를 표시
+# harness-prompt-history.sh — User Prompt History pane
+# 사용자가 입력한 프롬프트만 표시 + 현재 처리 단계(Planner/Team) 표시
 # Usage: bash scripts/harness-prompt-history.sh [project-root]
 
 set -uo pipefail
@@ -14,7 +14,8 @@ if [ -z "$PROJECT_ROOT" ]; then
 fi
 
 PROGRESS_LOG="$PROJECT_ROOT/.harness/progress.log"
-AUDIT_LOG="$PROJECT_ROOT/.harness/actions/audit.log"
+PROGRESS="$PROJECT_ROOT/.harness/progress.json"
+QUEUE="$PROJECT_ROOT/.harness/actions/feature-queue.json"
 
 BOLD="\033[1m"
 DIM="\033[2m"
@@ -23,93 +24,138 @@ YELLOW="\033[33m"
 RED="\033[31m"
 CYAN="\033[36m"
 MAGENTA="\033[35m"
+WHITE="\033[37m"
 RESET="\033[0m"
+BG_BLUE="\033[44m"
+BG_GREEN="\033[42m"
+BG_YELLOW="\033[43m"
 
 render_header() {
-  echo -e "${BOLD}PROMPT HISTORY${RESET}  ${DIM}$(date +%H:%M:%S)${RESET}"
+  echo -e "${BOLD}USER PROMPTS${RESET}  ${DIM}$(date +%H:%M:%S)${RESET}"
   echo ""
 }
 
-render_progress_log() {
+# 현재 처리 상태 배지
+render_processing_status() {
+  local mode="solo" current_agent="none" agent_status="pending"
+
+  if [ -f "$PROGRESS" ] && command -v jq &>/dev/null; then
+    mode=$(jq -r '.mode // "solo"' "$PROGRESS" 2>/dev/null)
+    current_agent=$(jq -r '.current_agent // "none"' "$PROGRESS" 2>/dev/null)
+    agent_status=$(jq -r '.agent_status // "pending"' "$PROGRESS" 2>/dev/null)
+  fi
+
+  local badge=""
+  case "$mode" in
+    team)
+      # Team 모드: 각 팀의 현재 상태 표시
+      badge="${BG_BLUE}${WHITE}${BOLD} TEAM MODE ${RESET}"
+      if [ -f "$QUEUE" ]; then
+        local team_info=""
+        for i in 1 2 3; do
+          local t_status t_feature t_phase
+          t_status=$(jq -r ".teams[\"$i\"].status // \"idle\"" "$QUEUE" 2>/dev/null)
+          t_feature=$(jq -r ".teams[\"$i\"].feature // \"\"" "$QUEUE" 2>/dev/null)
+          if [ "$t_status" = "busy" ] && [ -n "$t_feature" ] && [ "$t_feature" != "null" ]; then
+            t_phase=$(jq -r --arg f "$t_feature" '.queue.in_progress[$f].phase // "?"' "$QUEUE" 2>/dev/null)
+            team_info+="  ${CYAN}T${i}${RESET}:${t_feature}(${t_phase})"
+          else
+            team_info+="  ${DIM}T${i}:idle${RESET}"
+          fi
+        done
+        echo -e "  ${badge}${team_info}"
+      else
+        echo -e "  ${badge}"
+      fi
+      ;;
+    paused)
+      echo -e "  ${BG_YELLOW}${WHITE}${BOLD} PAUSED ${RESET}  ${DIM}/harness-team 또는 /harness-solo${RESET}"
+      ;;
+    *)
+      # Solo 모드: 현재 에이전트 표시
+      if [ "$current_agent" != "none" ] && [ "$current_agent" != "null" ]; then
+        local agent_color="$RESET"
+        case "$current_agent" in
+          planner*)     agent_color="$YELLOW" ;;
+          generator*)   agent_color="$GREEN" ;;
+          eval*)        agent_color="$RED" ;;
+          dispatcher*)  agent_color="$MAGENTA" ;;
+        esac
+        local status_icon="·"
+        case "$agent_status" in
+          running)   status_icon="▶" ;;
+          completed) status_icon="✓" ;;
+          failed)    status_icon="✗" ;;
+        esac
+        echo -e "  ${BG_GREEN}${WHITE}${BOLD} SOLO ${RESET}  ${agent_color}${status_icon} ${current_agent}${RESET}"
+      else
+        echo -e "  ${BG_GREEN}${WHITE}${BOLD} SOLO ${RESET}  ${DIM}대기 중${RESET}"
+      fi
+      ;;
+  esac
+  echo ""
+}
+
+# 사용자 프롬프트만 필터하여 표시
+render_user_prompts() {
   if [ ! -f "$PROGRESS_LOG" ]; then
-    echo -e "  ${DIM}(no progress.log yet)${RESET}"
+    echo -e "  ${DIM}(프롬프트 기록 없음)${RESET}"
     return
   fi
 
-  grep -v '^#' "$PROGRESS_LOG" 2>/dev/null | grep -v '^$' | tail -20 | while IFS= read -r line; do
-    local ts agent action detail
-    ts=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$1); print $1}')
-    agent=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$2); print $2}')
-    action=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$3); print $3}')
-    detail=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$4); print $4}')
+  local term_height
+  term_height=$(tput lines 2>/dev/null || echo 30)
+  local max_lines=$((term_height - 10))
+  if [ "$max_lines" -lt 5 ]; then max_lines=5; fi
 
-    local short_ts icon color
-    short_ts=$(echo "$ts" | grep -oE '[0-9]{2}:[0-9]{2}:[0-9]{2}' || echo "$ts")
-
-    case "$agent" in
-      dispatcher*)  icon="▸" ; color="$MAGENTA" ;;
-      brainstormer) icon="◇" ; color="$CYAN" ;;
-      planner*)     icon="□" ; color="$YELLOW" ;;
-      generator*)   icon="▶" ; color="$GREEN" ;;
-      eval*)        icon="✦" ; color="$RED" ;;
-      user|manual)  icon="★" ; color="$BOLD" ;;
-      team*)        icon="⊕" ; color="$CYAN" ;;
-      *)            icon="·" ; color="$DIM" ;;
-    esac
-
-    if [ ${#detail} -gt 40 ]; then detail="${detail:0:38}.."; fi
-
-    printf "  %b%b%b %b%-8s%b %b%s%b %b%s%b\n" \
-      "$color" "$icon" "$RESET" \
-      "$DIM" "$short_ts" "$RESET" \
-      "$RESET" "$agent" "$RESET" \
-      "$DIM" "$action" "$RESET"
-    if [ -n "$detail" ] && [ "$detail" != " " ]; then
-      echo -e "    ${DIM}${detail}${RESET}"
-    fi
-  done
-}
+  # user-prompt 행만 필터
+  local prompts
+  prompts=$(grep '| user-prompt |' "$PROGRESS_LOG" 2>/dev/null | tail -"$max_lines")
 
-render_audit_tail() {
-  if [ ! -f "$AUDIT_LOG" ]; then return; fi
+  if [ -z "$prompts" ]; then
+    echo -e "  ${DIM}(사용자 프롬프트 없음)${RESET}"
+    return
+  fi
 
-  echo ""
-  echo -e "${BOLD}AUDIT${RESET}"
+  local line_num=0
+  local total_prompts
+  total_prompts=$(grep -c '| user-prompt |' "$PROGRESS_LOG" 2>/dev/null || echo 0)
+
+  echo "$prompts" | while IFS= read -r line; do
+    line_num=$((line_num + 1))
 
-  grep -v '^#' "$AUDIT_LOG" 2>/dev/null | grep -v '^$' | tail -10 | while IFS= read -r line; do
-    local ts agent action status target
+    local ts detail
     ts=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$1); print $1}')
-    agent=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$2); print $2}')
-    action=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$3); print $3}')
-    status=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$4); print $4}')
-    target=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$5); print $5}')
-
-    local color="$RESET" icon="·"
-    case "$status" in
-      start)    color="$CYAN";  icon="▶" ;;
-      complete) color="$GREEN"; icon="✓" ;;
-      fail)     color="$RED";   icon="✗" ;;
-      pass)     color="$GREEN"; icon="✓" ;;
-      skip)     color="$DIM";   icon="–" ;;
-    esac
+    detail=$(echo "$line" | awk -F'|' '{gsub(/^ +| +$/,"",$4); print $4}')
 
     local short_ts
-    short_ts=$(echo "$ts" | grep -oE '[0-9]{2}:[0-9]{2}:[0-9]{2}' || echo "$ts")
+    short_ts=$(echo "$ts" | grep -oE '[0-9]{2}:[0-9]{2}' | tail -1 || echo "$ts")
+
+    # 프롬프트 내용 truncate
+    local max_width
+    max_width=$(( $(tput cols 2>/dev/null || echo 40) - 12 ))
+    if [ "$max_width" -lt 20 ]; then max_width=20; fi
+    if [ ${#detail} -gt "$max_width" ]; then
+      detail="${detail:0:$((max_width - 2))}.."
+    fi
 
-    if [ ${#target} -gt 25 ]; then target="${target:0:23}.."; fi
+    # 처리 상태 찾기: 이 프롬프트 이후의 첫 번째 에이전트 액션
+    local processed_by=""
+    local prompt_ts_epoch
+    prompt_ts_epoch=$(echo "$ts" | sed 's/[^0-9:]//g')
 
-    printf "  %b%b%b %b%s%b %-10s %b%s%b\n" \
-      "$color" "$icon" "$RESET" \
-      "$DIM" "$short_ts" "$RESET" \
-      "$agent" \
-      "$DIM" "$target" "$RESET"
+    # 간단히: 마지막 프롬프트인지 확인 → 현재 처리 중 표시
+    echo -e "  ${DIM}${short_ts}${RESET}  ${WHITE}${detail}${RESET}"
   done
+
+  echo ""
+  echo -e "  ${DIM}── ${total_prompts} prompts total ──${RESET}"
 }
 
 render_all() {
   render_header
-  render_progress_log
-  render_audit_tail
+  render_processing_status
+  render_user_prompts
 }
 
 # ── Main loop ──

package/scripts/harness-tmux.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# harness-tmux.sh — Unified Harness Studio tmux layout
+# harness-tmux.sh — Unified Harness Studio layout
 #
 # Team Mode (--team):
 # ┌──────────────┬──────────────┬──────────────┐
@@ -12,14 +12,10 @@
 # │   Codex)     │              │   TEAM 3     │
 # └──────────────┴──────────────┴──────────────┘
 #
-# Solo Mode (--solo):
-# ┌──────────────┬──────────────┬──────────────┐
-# │  Dashboard   │  Monitor     │  Agent       │
-# │              │  (compact)   │  Session     │
-# ├──────────────┤              │              │
-# │  Prompt      │              │              │
-# │  History     │              │              │
-# └──────────────┴──────────────┴──────────────┘
+# Rendering strategy:
+#   1. iTerm2 detected → native split panes (no tmux needed)
+#   2. tmux available  → tmux session
+#   3. Fallback        → open new terminal windows
 #
 # Usage:
 #   bash scripts/harness-tmux.sh [project-root] --team
@@ -41,7 +37,22 @@ for arg in "$@"; do
     --solo)   MODE="solo" ;;
     --detach) DETACH=true ;;
     --kill)
-      tmux kill-session -t "$SESSION_NAME" 2>/dev/null && echo "Killed." || echo "No session."
+      tmux kill-session -t "$SESSION_NAME" 2>/dev/null && echo "tmux session killed." || true
+      # Also try to close iTerm2 studio tab if exists
+      if [ "${TERM_PROGRAM:-}" = "iTerm.app" ]; then
+        osascript -e '
+          tell application "iTerm2"
+            repeat with w in windows
+              repeat with t in tabs of w
+                if name of current session of t contains "harness-studio" then
+                  close t
+                end if
+              end repeat
+            end repeat
+          end tell
+        ' 2>/dev/null || true
+      fi
+      echo "Killed."
       exit 0
       ;;
     *)
@@ -72,134 +83,215 @@ if [ -z "$MODE" ]; then
 fi
 
 echo "Project: $PROJECT_ROOT"
-echo "Session: $SESSION_NAME"
 echo "Mode: $MODE"
 
-tmux kill-session -t "$SESSION_NAME" 2>/dev/null || true
-
 # ══════════════════════════════════════════
-# Team Mode: 3-column layout (6 panes)
+# Strategy 1: iTerm2 native split panes
 # ══════════════════════════════════════════
-if [ "$MODE" = "team" ]; then
+launch_iterm2_team() {
+  osascript <<APPLESCRIPT
+    tell application "iTerm2"
+      activate
 
-  # 1. Create session → Left pane (will become Prompt History)
-  PANE_LEFT=$(tmux new-session -d -s "$SESSION_NAME" -c "$PROJECT_ROOT" -x 220 -y 55 \
-    -P -F '#{pane_id}')
+      -- Create new window with first session (Prompt History)
+      set studioWindow to (create window with default profile)
 
-  # 2. Split horizontally: Left 30% | Right 70%
-  PANE_MID=$(tmux split-window -h -p 70 -t "$PANE_LEFT" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}')
+      tell studioWindow
+        tell current session of current tab
+          set name to "harness-studio"
+          write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-prompt-history.sh' '${PROJECT_ROOT}'"
 
-  # 3. Split right section: Middle 40% | Right 60% (Teams)
-  PANE_T1=$(tmux split-window -h -p 60 -t "$PANE_MID" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}' \
-    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 1'")
+          -- Split right → Dashboard
+          set dashPane to (split vertically with default profile)
+          tell dashPane
+            write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-dashboard.sh' '${PROJECT_ROOT}'"
 
-  # 4. Split Team 1 vertically → Team 2 (bottom 66%)
-  PANE_T2=$(tmux split-window -v -p 66 -t "$PANE_T1" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}' \
-    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 2'")
+            -- Split right → Team 1
+            set t1Pane to (split vertically with default profile)
+            tell t1Pane
+              write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-monitor.sh' '${PROJECT_ROOT}' --team 1"
 
-  # 5. Split Team 2 vertically → Team 3 (bottom 50%)
-  PANE_T3=$(tmux split-window -v -p 50 -t "$PANE_T2" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}' \
-    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 3'")
+              -- Split down → Team 2
+              set t2Pane to (split horizontally with default profile)
+              tell t2Pane
+                write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-monitor.sh' '${PROJECT_ROOT}' --team 2"
 
-  # 6. Split left pane vertically: Prompt History (top 45%) | Controller (bottom 55%)
-  PANE_CTRL=$(tmux split-window -v -p 55 -t "$PANE_LEFT" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}')
+                -- Split down → Team 3
+                set t3Pane to (split horizontally with default profile)
+                tell t3Pane
+                  write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-monitor.sh' '${PROJECT_ROOT}' --team 3"
+                end tell
+              end tell
+            end tell
+          end tell
 
-  # 7. Start Prompt History in left-top
-  tmux send-keys -t "$PANE_LEFT" "bash \"${SCRIPT_DIR}/harness-prompt-history.sh\" \"${PROJECT_ROOT}\"" Enter
+          -- Split down → Controller (bottom-left)
+          set ctrlPane to (split horizontally with default profile)
+          tell ctrlPane
+            write text "cd '${PROJECT_ROOT}' && clear"
+          end tell
+        end tell
+      end tell
+    end tell
+APPLESCRIPT
+}
 
-  # 8. Start Dashboard in middle pane
-  tmux send-keys -t "$PANE_MID" "bash \"${SCRIPT_DIR}/harness-dashboard.sh\" \"${PROJECT_ROOT}\"" Enter
+launch_iterm2_solo() {
+  osascript <<APPLESCRIPT
+    tell application "iTerm2"
+      activate
+
+      set studioWindow to (create window with default profile)
+
+      tell studioWindow
+        tell current session of current tab
+          set name to "harness-studio"
+          write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-dashboard.sh' '${PROJECT_ROOT}'"
+
+          -- Split right → Monitor
+          set monPane to (split vertically with default profile)
+          tell monPane
+            write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-monitor.sh' '${PROJECT_ROOT}'"
+
+            -- Split right → Agent Session
+            set agentPane to (split vertically with default profile)
+            tell agentPane
+              write text "cd '${PROJECT_ROOT}' && clear"
+            end tell
+          end tell
 
-  # 9. Controller pane — ready for Claude/Codex
-  tmux send-keys -t "$PANE_CTRL" "unset npm_config_prefix 2>/dev/null" Enter
+          -- Split down → Prompt History (bottom-left)
+          set histPane to (split horizontally with default profile)
+          tell histPane
+            write text "cd '${PROJECT_ROOT}' && bash '${SCRIPT_DIR}/harness-prompt-history.sh' '${PROJECT_ROOT}'"
+          end tell
+        end tell
+      end tell
+    end tell
+APPLESCRIPT
+}
+
+# ══════════════════════════════════════════
+# Strategy 2: tmux
+# ══════════════════════════════════════════
+launch_tmux_team() {
+  tmux kill-session -t "$SESSION_NAME" 2>/dev/null || true
+
+  PANE_LEFT=$(tmux new-session -d -s "$SESSION_NAME" -c "$PROJECT_ROOT" -x 220 -y 55 -P -F '#{pane_id}')
+  PANE_MID=$(tmux split-window -h -p 70 -t "$PANE_LEFT" -c "$PROJECT_ROOT" -P -F '#{pane_id}')
+  PANE_T1=$(tmux split-window -h -p 60 -t "$PANE_MID" -c "$PROJECT_ROOT" -P -F '#{pane_id}' \
+    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 1'")
+  PANE_T2=$(tmux split-window -v -p 66 -t "$PANE_T1" -c "$PROJECT_ROOT" -P -F '#{pane_id}' \
+    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 2'")
+  PANE_T3=$(tmux split-window -v -p 50 -t "$PANE_T2" -c "$PROJECT_ROOT" -P -F '#{pane_id}' \
+    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\" --team 3'")
+  PANE_CTRL=$(tmux split-window -v -p 55 -t "$PANE_LEFT" -c "$PROJECT_ROOT" -P -F '#{pane_id}')
+
+  tmux send-keys -t "$PANE_LEFT" "bash \"${SCRIPT_DIR}/harness-prompt-history.sh\" \"${PROJECT_ROOT}\"" Enter
+  tmux send-keys -t "$PANE_MID" "bash \"${SCRIPT_DIR}/harness-dashboard.sh\" \"${PROJECT_ROOT}\"" Enter
   tmux send-keys -t "$PANE_CTRL" "clear" Enter
 
-  # Pane titles
   tmux select-pane -t "$PANE_LEFT"  -T "Prompt History"
   tmux select-pane -t "$PANE_CTRL"  -T "Controller"
   tmux select-pane -t "$PANE_MID"   -T "Dashboard"
   tmux select-pane -t "$PANE_T1"    -T "TEAM 1"
   tmux select-pane -t "$PANE_T2"    -T "TEAM 2"
   tmux select-pane -t "$PANE_T3"    -T "TEAM 3"
-
-  # Focus on Controller
   tmux select-pane -t "$PANE_CTRL"
 
-# ══════════════════════════════════════════
-# Solo Mode: 3-column layout (5 panes)
-# ══════════════════════════════════════════
-else
+  tmux set-option -t "$SESSION_NAME" pane-border-status top 2>/dev/null || true
+  tmux set-option -t "$SESSION_NAME" pane-border-format " #{pane_title} " 2>/dev/null || true
+}
 
-  # 1. Create session → Dashboard pane
-  PANE_DASHBOARD=$(tmux new-session -d -s "$SESSION_NAME" -c "$PROJECT_ROOT" -x 200 -y 50 \
-    -P -F '#{pane_id}' \
-    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-dashboard.sh\" \"${PROJECT_ROOT}\"'")
+launch_tmux_solo() {
+  tmux kill-session -t "$SESSION_NAME" 2>/dev/null || true
 
-  # 2. Split horizontally: Left 40% | Right 60%
-  PANE_MONITOR=$(tmux split-window -h -p 60 -t "$PANE_DASHBOARD" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}' \
+  PANE_DASHBOARD=$(tmux new-session -d -s "$SESSION_NAME" -c "$PROJECT_ROOT" -x 200 -y 50 -P -F '#{pane_id}' \
+    "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-dashboard.sh\" \"${PROJECT_ROOT}\"'")
+  PANE_MONITOR=$(tmux split-window -h -p 60 -t "$PANE_DASHBOARD" -c "$PROJECT_ROOT" -P -F '#{pane_id}' \
     "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-monitor.sh\" \"${PROJECT_ROOT}\"'")
-
-  # 3. Split Dashboard vertically: Dashboard (top 70%) | Prompt History (bottom 30%)
-  PANE_HISTORY=$(tmux split-window -v -p 30 -t "$PANE_DASHBOARD" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}' \
+  PANE_HISTORY=$(tmux split-window -v -p 30 -t "$PANE_DASHBOARD" -c "$PROJECT_ROOT" -P -F '#{pane_id}' \
     "bash --norc --noprofile -c 'exec bash \"${SCRIPT_DIR}/harness-prompt-history.sh\" \"${PROJECT_ROOT}\"'")
+  PANE_AGENT=$(tmux split-window -v -p 85 -t "$PANE_MONITOR" -c "$PROJECT_ROOT" -P -F '#{pane_id}')
 
-  # 4. Split Monitor: Monitor (top 15%) | Agent Session (bottom 85%)
-  PANE_AGENT=$(tmux split-window -v -p 85 -t "$PANE_MONITOR" -c "$PROJECT_ROOT" \
-    -P -F '#{pane_id}')
-
-  # 5. Agent Session — empty shell ready for claude
-  tmux send-keys -t "$PANE_AGENT" "unset npm_config_prefix 2>/dev/null" Enter
   tmux send-keys -t "$PANE_AGENT" "clear" Enter
 
-  # Pane titles
   tmux select-pane -t "$PANE_DASHBOARD" -T "Dashboard"
   tmux select-pane -t "$PANE_MONITOR"   -T "Monitor"
   tmux select-pane -t "$PANE_HISTORY"   -T "Prompt History"
   tmux select-pane -t "$PANE_AGENT"     -T "Agent Session"
-
-  # Focus on Agent Session
   tmux select-pane -t "$PANE_AGENT"
+
+  tmux set-option -t "$SESSION_NAME" pane-border-status top 2>/dev/null || true
+  tmux set-option -t "$SESSION_NAME" pane-border-format " #{pane_title} " 2>/dev/null || true
+}
+
+# ══════════════════════════════════════════
+# Dispatch: pick best strategy
+# ══════════════════════════════════════════
+
+# Detect iTerm2 — works even from Claude Code's non-TTY Bash
+IS_ITERM=false
+if [ "${TERM_PROGRAM:-}" = "iTerm.app" ]; then
+  IS_ITERM=true
+elif [ "$(uname)" = "Darwin" ]; then
+  # Check if iTerm2 is running (for non-TTY environments like Claude Code)
+  if pgrep -q "iTerm2" 2>/dev/null; then
+    IS_ITERM=true
+  fi
 fi
 
-# ── Common settings ──
-tmux set-option -t "$SESSION_NAME" pane-border-status top 2>/dev/null || true
-tmux set-option -t "$SESSION_NAME" pane-border-format " #{pane_title} " 2>/dev/null || true
+HAS_TMUX=false
+if command -v tmux &>/dev/null; then
+  HAS_TMUX=true
+fi
 
-# ── Attach ──
-if [ "$DETACH" = true ]; then
-  echo ""
-  echo "Session created. Attach: tmux attach -t $SESSION_NAME"
+if [ "$IS_ITERM" = true ]; then
+  echo "Strategy: iTerm2 native split panes"
+  if [ "$MODE" = "team" ]; then
+    launch_iterm2_team
+  else
+    launch_iterm2_solo
+  fi
   echo "Layout ready"
-elif ! tty -s 2>/dev/null; then
-  # Non-terminal environment (e.g., Claude Code agent session)
-  # Try opening Terminal.app on macOS, otherwise detach silently
-  if [ "$(uname)" = "Darwin" ]; then
-    osascript -e "
-      tell application \"Terminal\"
-        do script \"tmux attach -t $SESSION_NAME\"
-        activate
-      end tell
-    " 2>/dev/null && \
-      echo "OPENED_TERMINAL=true" || echo "Layout ready"
+
+elif [ "$HAS_TMUX" = true ]; then
+  echo "Strategy: tmux"
+  if [ "$MODE" = "team" ]; then
+    launch_tmux_team
   else
-    echo "Session created (non-terminal). Attach: tmux attach -t $SESSION_NAME"
-    echo "Layout ready"
+    launch_tmux_solo
   fi
-else
-  if [ -n "${TMUX:-}" ]; then
-    tmux switch-client -t "$SESSION_NAME"
+
+  # Attach to tmux
+  if [ "$DETACH" = true ]; then
+    echo "Session created. Attach: tmux attach -t $SESSION_NAME"
+    echo "Layout ready"
+  elif ! tty -s 2>/dev/null; then
+    # Non-TTY (e.g., Claude Code Bash tool) — open in new terminal
+    if [ "$(uname)" = "Darwin" ]; then
+      osascript -e "
+        tell application \"Terminal\"
+          do script \"tmux attach -t $SESSION_NAME\"
+          activate
+        end tell
+      " 2>/dev/null && echo "OPENED_TERMINAL=true" || echo "Layout ready"
+    else
+      echo "Session created. Attach: tmux attach -t $SESSION_NAME"
+      echo "Layout ready"
+    fi
   else
-    echo ""
-    echo "Launching Harness Studio ($MODE mode)..."
-    echo "  Stop: bash scripts/harness-tmux.sh --kill"
-    echo ""
-    tmux attach -t "$SESSION_NAME"
+    if [ -n "${TMUX:-}" ]; then
+      tmux switch-client -t "$SESSION_NAME"
+    else
+      echo "Launching Harness Studio ($MODE mode)..."
+      tmux attach -t "$SESSION_NAME"
+    fi
   fi
+
+else
+  echo "ERROR: Neither iTerm2 nor tmux found."
+  echo "Install tmux: brew install tmux"
+  echo "Or use iTerm2: https://iterm2.com"
+  exit 1
 fi