happy-stacks 0.1.0 → 0.2.0

package/extras/swiftbar/lib/render.sh

@@ -21,9 +21,16 @@ level_from_server_daemon() {
 
 color_for_level() {
   local level="$1"
-  if [[ "$level" == "green" ]]; then echo "$GREEN"; return; fi
-  if [[ "$level" == "orange" ]]; then echo "$YELLOW"; return; fi
-  echo "$RED"
+  if [[ "$level" == "green" ]]; then echo "#16a34a"; return; fi
+  if [[ "$level" == "orange" ]]; then echo "#f59e0b"; return; fi
+  echo "#e74c3c"
+}
+
+sfconfig_for_level() {
+  local level="$1"
+  local color="$(color_for_level "$level")"
+  # sfconfig	SFSymbol configuration	Configures Rendering Mode for sfimage. Accepts a json encoded as base64, example json {"renderingMode":"Palette", "colors":["red","blue"], "scale": "large", "weight": "bold"}. Original issue #354
+  echo "{\"colors\":[\"$color\"], \"scale\": \"small\"}" | base64 -b 0
 }
 
 sf_for_level() {
@@ -33,6 +40,13 @@ sf_for_level() {
   echo "xmark.circle.fill"
 }
 
+sf_suffix_for_level() {
+  local level="$1"
+  if [[ "$level" == "green" ]]; then echo "badge.checkmark"; return; fi
+  if [[ "$level" == "orange" ]]; then echo "trianglebadge.exclamationmark"; return; fi
+  echo "badge.xmark"
+}
+
 print_item() {
   local prefix="$1"
   shift
@@ -60,12 +74,16 @@ render_component_server() {
 
   local label="Server (${server_component})"
   local sf="$(sf_for_level "$level")"
-  local color="$(color_for_level "$level")"
-  print_item "$prefix" "$label | sfimage=$sf color=$color"
+  local sfconfig="$(sfconfig_for_level "$level")"
+  print_item "$prefix" "$label | sfimage=$sf sfconfig=$sfconfig"
 
   local p2="${prefix}--"
   print_item "$p2" "Status: $server_status"
-  print_item "$p2" "Internal: http://127.0.0.1:${port}"
+  if [[ -n "$port" ]]; then
+    print_item "$p2" "Internal: http://127.0.0.1:${port}"
+  else
+    print_item "$p2" "Port: ephemeral (allocated at start time)"
+  fi
   if [[ -n "$server_pid" ]]; then
     if [[ -n "$server_metrics" ]]; then
       local cpu mem etime
@@ -77,20 +95,24 @@ render_component_server() {
       print_item "$p2" "PID: ${server_pid}"
     fi
   fi
-  print_item "$p2" "Open UI (local) | href=http://localhost:${port}/"
-  print_item "$p2" "Open Health | href=http://127.0.0.1:${port}/health"
+  if [[ -n "$port" ]]; then
+    print_item "$p2" "Open UI (local) | href=http://localhost:${port}/"
+    print_item "$p2" "Open Health | href=http://127.0.0.1:${port}/health"
+  fi
   if [[ -n "$tailscale_url" ]]; then
     print_item "$p2" "Open UI (Tailscale) | href=$tailscale_url"
   fi
 
   # Start/stop shortcuts (so you can control from the Server submenu too).
   if [[ -n "$PNPM_BIN" ]]; then
-    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
     local plist=""
     local svc_installed="0"
-    if [[ -n "$launch_label" ]]; then
-      plist="$HOME/Library/LaunchAgents/${launch_label}.plist"
-      [[ -f "$plist" ]] && svc_installed="1"
+    if ! swiftbar_is_sandboxed; then
+      if [[ -n "$launch_label" ]]; then
+        plist="$HOME/Library/LaunchAgents/${launch_label}.plist"
+        [[ -f "$plist" ]] && svc_installed="1"
+      fi
     fi
 
     print_sep "$p2"
@@ -104,7 +126,7 @@ render_component_server() {
         print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=service:restart dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
       else
         if [[ "$server_status" == "running" ]]; then
-          print_item "$p2" "Stop (kill port listeners) | bash=$PNPM_TERM param1=stack:fix dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+          print_item "$p2" "Stop stack | bash=$PNPM_BIN param1=stack param2=stop param3=main dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
         else
           print_item "$p2" "Start stack (foreground) | bash=$PNPM_TERM param1=start dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
         fi
@@ -119,7 +141,7 @@ render_component_server() {
         print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=stack param2=service:restart param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
       else
         if [[ "$server_status" == "running" ]]; then
-          print_item "$p2" "Stop (kill port listeners) | bash=$PNPM_TERM param1=stack param2=fix param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+          print_item "$p2" "Stop stack | bash=$PNPM_BIN param1=stack param2=stop param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
         else
           print_item "$p2" "Start stack (foreground) | bash=$PNPM_TERM param1=stack param2=start param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
         fi
@@ -130,7 +152,7 @@ render_component_server() {
   # Flavor switching (status-aware: only show switching to the other option).
   local helper="$HAPPY_LOCAL_DIR/extras/swiftbar/set-server-flavor.sh"
   if [[ -n "$PNPM_BIN" ]]; then
-    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
     print_sep "$p2"
     if [[ "$server_component" == "happy-server" ]]; then
       print_item "$p2" "Switch to happy-server-light (restart if service installed) | bash=$helper param1=$stack_name param2=happy-server-light dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
@@ -159,9 +181,10 @@ render_component_daemon() {
   if [[ "$daemon_status" == "running" ]]; then level="green"; fi
   if [[ "$daemon_status" == "running-no-http" || "$daemon_status" == "stale" || "$daemon_status" == "auth_required" || "$daemon_status" == "starting" ]]; then level="orange"; fi
 
+  local sfconfig="$(sfconfig_for_level "$level")"
+
   local sf="$(sf_for_level "$level")"
-  local color="$(color_for_level "$level")"
-  print_item "$prefix" "Daemon | sfimage=$sf color=$color"
+  print_item "$prefix" "Daemon | sfimage=$sf sfconfig=$sfconfig"
 
   local p2="${prefix}--"
   print_item "$p2" "Status: $daemon_status"
@@ -187,28 +210,29 @@ render_component_daemon() {
       # Provide a direct "fix" action for the common first-run problem under launchd.
       local auth_helper="$HAPPY_LOCAL_DIR/extras/swiftbar/auth-login.sh"
       local server_url="http://127.0.0.1:$(resolve_main_port)"
-      local webapp_url
-      webapp_url="$(get_tailscale_url)"
-      [[ -z "$webapp_url" ]] && webapp_url="http://localhost:$(resolve_main_port)"
+      local webapp_url="http://localhost:$(resolve_main_port)"
       if [[ "$stack_name" == "main" ]]; then
-        print_item "$p2" "Auth login (opens browser) | bash=$auth_helper param1=main param2=$server_url param3=$webapp_url dir=$HAPPY_LOCAL_DIR terminal=false refresh=false"
+        print_item "$p2" "Auth login (opens browser) | bash=$auth_helper param1=main dir=$HAPPY_LOCAL_DIR terminal=false refresh=false"
       else
         # For stacks, best-effort use the stack's configured port if available (fallback to main port).
-        local env_file="$HOME/.happy/stacks/$stack_name/env"
+        local env_file
+        env_file="$(resolve_stack_env_file "$stack_name")"
         local port
-        port="$(dotenv_get "$env_file" "HAPPY_LOCAL_SERVER_PORT")"
+        port="$(dotenv_get "$env_file" "HAPPY_STACKS_SERVER_PORT")"
+        [[ -z "$port" ]] && port="$(dotenv_get "$env_file" "HAPPY_LOCAL_SERVER_PORT")"
         [[ -z "$port" ]] && port="$(resolve_main_port)"
         server_url="http://127.0.0.1:${port}"
-        webapp_url="$(get_tailscale_url)"
-        [[ -z "$webapp_url" ]] && webapp_url="http://localhost:${port}"
-        print_item "$p2" "Auth login (opens browser) | bash=$auth_helper param1=$stack_name param2=$server_url param3=$webapp_url param4=$HOME/.happy/stacks/$stack_name/cli dir=$HAPPY_LOCAL_DIR terminal=false refresh=false"
+        webapp_url="http://localhost:${port}"
+        print_item "$p2" "Auth login (opens browser) | bash=$auth_helper param1=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=false"
       fi
       print_sep "$p2"
     fi
-    if [[ "$stack_name" == "main" ]]; then
-      print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=service:restart dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
-    else
-      print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=stack param2=service:restart param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+    if ! swiftbar_is_sandboxed; then
+      if [[ "$stack_name" == "main" ]]; then
+        print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=service:restart dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      else
+        print_item "$p2" "Restart stack (service) | bash=$PNPM_BIN param1=stack param2=service:restart param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      fi
     fi
   fi
 }
@@ -222,13 +246,20 @@ render_component_autostart() {
   local autostart_metrics="$6"
   local logs_dir="$7"
 
+  if swiftbar_is_sandboxed; then
+    print_item "$prefix" "Autostart | sfimage=exclamationmark.triangle sfconfig=light"
+    local p2="${prefix}--"
+    print_item "$p2" "Status: disabled in sandbox"
+    return
+  fi
+
   local level="red"
   if [[ "$launchagent_status" == "loaded" ]]; then level="green"; fi
   if [[ "$launchagent_status" == "unloaded" ]]; then level="orange"; fi
 
   local sf="$(sf_for_level "$level")"
-  local color="$(color_for_level "$level")"
-  print_item "$prefix" "Autostart | sfimage=$sf color=$color"
+  local sfconfig="$(sfconfig_for_level "$level")"
+  print_item "$prefix" "Autostart | sfimage=$sf sfconfig=$sfconfig"
 
   local p2="${prefix}--"
   print_item "$p2" "Status: $launchagent_status"
@@ -292,8 +323,8 @@ render_component_tailscale() {
   [[ -n "$tailscale_url" ]] && level="green"
 
   local sf="$(sf_for_level "$level")"
-  local color="$(color_for_level "$level")"
-  print_item "$prefix" "Tailscale | sfimage=$sf color=$color"
+  local sfconfig="$(sfconfig_for_level "$level")"
+  print_item "$prefix" "Tailscale | sfimage=$sf sfconfig=$sfconfig"
 
   local p2="${prefix}--"
   if [[ -n "$tailscale_url" ]]; then
@@ -306,13 +337,18 @@ render_component_tailscale() {
     print_item "$p2" "Status: not configured / unknown"
   fi
 
+  # Tailscale Serve is global machine state; never offer enable/disable actions in sandbox mode.
+  if swiftbar_is_sandboxed; then
+    return
+  fi
+
   if [[ -z "$PNPM_BIN" ]]; then
     return
   fi
   print_sep "$p2"
 
   if [[ "$stack_name" == "main" ]]; then
-    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
     print_item "$p2" "Tailscale status | bash=$PNPM_TERM param1=tailscale:status dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     if [[ -n "$tailscale_url" ]]; then
       print_item "$p2" "Disable Tailscale Serve | bash=$PNPM_BIN param1=tailscale:disable dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
@@ -323,7 +359,7 @@ render_component_tailscale() {
     return
   fi
 
-  local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+  local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
   print_item "$p2" "Tailscale status | bash=$PNPM_TERM param1=stack param2=tailscale:status param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
   if [[ -n "$tailscale_url" ]]; then
     print_item "$p2" "Disable Tailscale Serve | bash=$PNPM_BIN param1=stack param2=tailscale:disable param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
@@ -344,8 +380,12 @@ render_component_repo() {
   local stack_name="$4"
   local env_file="$5"
 
+  local t0 t1
+  t0="$(swiftbar_now_ms 2>/dev/null || echo 0)"
+
   local active_dir=""
-  if [[ "$context" == "stack" && -n "$env_file" ]]; then
+  # If we have an env file for the current context, prefer it (stack env is authoritative).
+  if [[ -n "$env_file" && -f "$env_file" ]]; then
     active_dir="$(resolve_component_dir_from_env_file "$env_file" "$component")"
   else
     active_dir="$(resolve_component_dir_from_env "$component")"
@@ -353,25 +393,51 @@ render_component_repo() {
 
   local level="red"
   local detail="missing"
-  if is_git_repo "$active_dir"; then
-    local dirty
-    dirty="$(git_dirty_flag "$active_dir")"
-    local ab
-    ab="$(git_ahead_behind "$active_dir")"
-    local ahead="" behind=""
-    if [[ -n "$ab" ]]; then
-      ahead="$(echo "$ab" | cut -d'|' -f1)"
-      behind="$(echo "$ab" | cut -d'|' -f2)"
+
+  local git_mode
+  git_mode="$(git_cache_mode)"
+
+  local stale="0"
+  local meta="" info="" wts=""
+  if [[ "$git_mode" == "cached" ]]; then
+    # Never refresh synchronously during menu render.
+    IFS=$'\t' read -r meta info wts stale <<<"$(git_cache_load_or_refresh "$context" "$stack_name" "$component" "$active_dir" "0")"
+  fi
+
+  local status="missing"
+  local dirty="" ahead="" behind="" wt_count=""
+  local branch="" head="" upstream=""
+  local main_branch="" main_upstream="" main_ahead="" main_behind=""
+  local oref="" o_ahead="" o_behind="" uref="" u_ahead="" u_behind=""
+
+  if [[ "$git_mode" == "cached" && -f "$info" ]]; then
+    IFS=$'\t' read -r status _ad branch head upstream dirty ahead behind main_branch main_upstream main_ahead main_behind oref o_ahead o_behind uref u_ahead u_behind wt_count <"$info" || true
+  elif [[ "$git_mode" == "live" ]]; then
+    # live mode only: do git work on every refresh
+    if is_git_repo "$active_dir"; then
+      status="ok"
+      dirty="$(git_dirty_flag "$active_dir")"
+      local ab
+      ab="$(git_ahead_behind "$active_dir")"
+      if [[ -n "$ab" ]]; then
+        ahead="$(echo "$ab" | cut -d'|' -f1)"
+        behind="$(echo "$ab" | cut -d'|' -f2)"
+      fi
     fi
+  fi
 
+  if [[ "$status" == "ok" ]]; then
+    detail="ok"
     if [[ "$dirty" == "dirty" ]] || [[ -n "$behind" && "$behind" != "0" ]]; then
       level="orange"
     else
       level="green"
     fi
-    detail="ok"
   fi
 
+  t1="$(swiftbar_now_ms 2>/dev/null || echo 0)"
+  swiftbar_profile_log "time" "label=render_component_repo" "component=${component}" "context=${context}" "ms=$((t1 - t0))" "detail=${detail}"
+
   local sf color
   sf="$(sf_for_level "$level")"
   color="$(color_for_level "$level")"
@@ -380,31 +446,50 @@ render_component_repo() {
   local p2="${prefix}--"
   print_item "$p2" "Dir: $(shorten_path "$active_dir" 52)"
   if [[ "$detail" != "ok" ]]; then
-    print_item "$p2" "Status: not a git repo / missing"
+    if [[ "$git_mode" == "cached" ]]; then
+      print_item "$p2" "Status: git cache missing (or not a git repo)"
+      local refresh="$HAPPY_LOCAL_DIR/extras/swiftbar/git-cache-refresh.sh"
+      if [[ -x "$refresh" ]]; then
+        print_sep "$p2"
+        if [[ "$context" == "stack" && -n "$stack_name" ]]; then
+          print_item "$p2" "Refresh Git cache (this stack) | bash=$refresh param1=stack param2=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+        else
+          print_item "$p2" "Refresh Git cache (main) | bash=$refresh param1=main dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+        fi
+      fi
+    else
+      print_item "$p2" "Status: not a git repo / missing"
+    fi
     if [[ -n "$PNPM_BIN" ]]; then
       print_sep "$p2"
-      local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+      local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
       print_item "$p2" "Bootstrap (clone missing components) | bash=$PNPM_TERM param1=bootstrap dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     fi
     return
   fi
 
-  local branch head upstream
-  branch="$(git_head_branch "$active_dir")"
-  head="$(git_head_short "$active_dir")"
-  upstream="$(git_upstream_short "$active_dir")"
-
-  local dirty
-  dirty="$(git_dirty_flag "$active_dir")"
-  local ab ahead behind
-  ab="$(git_ahead_behind "$active_dir")"
-  ahead=""
-  behind=""
-  if [[ -n "$ab" ]]; then
-    ahead="$(echo "$ab" | cut -d'|' -f1)"
-    behind="$(echo "$ab" | cut -d'|' -f2)"
+  # Cache status + refresh actions
+  if [[ "$git_mode" == "cached" ]]; then
+    local age=""
+    age="$(git_cache_age_sec "$meta")"
+    if [[ -n "$age" ]]; then
+      if [[ "$stale" == "1" ]]; then
+        print_item "$p2" "Git cache: stale (${age}s old) | color=$YELLOW"
+      else
+        print_item "$p2" "Git cache: fresh (${age}s old) | color=$GRAY"
+      fi
+    fi
+    local refresh="$HAPPY_LOCAL_DIR/extras/swiftbar/git-cache-refresh.sh"
+    if [[ -x "$refresh" ]]; then
+      print_sep "$p2"
+      print_item "$p2" "Refresh Git cache (this component) | bash=$refresh param1=component param2=$context param3=$stack_name param4=$component dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      if [[ "$context" == "stack" && -n "$stack_name" ]]; then
+        print_item "$p2" "Refresh Git cache (this stack) | bash=$refresh param1=stack param2=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      fi
+    fi
   fi
 
+  print_sep "$p2"
   print_item "$p2" "HEAD: ${branch:-"(unknown)"} ${head:+($head)}"
   print_item "$p2" "Upstream: ${upstream:-"(none)"}"
   if [[ -n "$ahead" && -n "$behind" ]]; then
@@ -412,31 +497,22 @@ render_component_repo() {
   fi
   print_item "$p2" "Working tree: ${dirty}"
 
-  local main_branch main_upstream main_ab
-  main_branch="$(git_main_branch_name "$active_dir")"
   if [[ -n "$main_branch" ]]; then
-    main_upstream="$(git_branch_upstream_short "$active_dir" "$main_branch")"
-    main_ab="$(git_branch_ahead_behind "$active_dir" "$main_branch")"
     if [[ -n "$main_upstream" ]]; then
       print_item "$p2" "Main: ${main_branch} → ${main_upstream}"
     else
       print_item "$p2" "Main: ${main_branch} → (no upstream)"
     fi
-    if [[ -n "$main_ab" ]]; then
-      print_item "$p2" "Main ahead/behind: $(echo "$main_ab" | cut -d'|' -f1)/$(echo "$main_ab" | cut -d'|' -f2)"
+    if [[ -n "$main_ahead" && -n "$main_behind" ]]; then
+      print_item "$p2" "Main ahead/behind: ${main_ahead}/${main_behind}"
     fi
 
     # Always show comparisons against origin/* and upstream/* when those remote refs exist.
     # (These reflect your last fetch; we do not auto-fetch in the menu.)
-    local oref uref
-    oref="$(git_remote_main_ref "$active_dir" "origin")"
-    uref="$(git_remote_main_ref "$active_dir" "upstream")"
     if [[ -n "$oref" ]]; then
       local oref_short="${oref#refs/remotes/}"
-      local oab
-      oab="$(git_ahead_behind_refs "$active_dir" "$oref" "$main_branch")"
-      if [[ -n "$oab" ]]; then
-        print_item "$p2" "Origin: ${oref_short} ahead/behind: $(echo "$oab" | cut -d'|' -f1)/$(echo "$oab" | cut -d'|' -f2)"
+      if [[ -n "$o_ahead" && -n "$o_behind" ]]; then
+        print_item "$p2" "Origin: ${oref_short} ahead/behind: ${o_ahead}/${o_behind}"
       else
         print_item "$p2" "Origin: ${oref_short}"
       fi
@@ -445,10 +521,8 @@ render_component_repo() {
     fi
     if [[ -n "$uref" ]]; then
       local uref_short="${uref#refs/remotes/}"
-      local uab
-      uab="$(git_ahead_behind_refs "$active_dir" "$uref" "$main_branch")"
-      if [[ -n "$uab" ]]; then
-        print_item "$p2" "Upstream: ${uref_short} ahead/behind: $(echo "$uab" | cut -d'|' -f1)/$(echo "$uab" | cut -d'|' -f2)"
+      if [[ -n "$u_ahead" && -n "$u_behind" ]]; then
+        print_item "$p2" "Upstream: ${uref_short} ahead/behind: ${u_ahead}/${u_behind}"
       else
         print_item "$p2" "Upstream: ${uref_short}"
       fi
@@ -457,15 +531,16 @@ render_component_repo() {
     fi
   fi
 
-  local wt_count
-  wt_count="$(git_worktree_count "$active_dir")"
+    local wt_count
+    # If cache didn't populate wt_count, fall back to empty string.
+    wt_count="${wt_count:-}"
 
   # Quick actions
   print_sep "$p2"
   print_item "$p2" "Open folder | bash=/usr/bin/open param1='$active_dir' terminal=false"
 
   if [[ -n "$PNPM_BIN" ]]; then
-    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
     # Run via stack wrappers when in a stack context so env-file stays authoritative.
     if [[ "$context" == "stack" && -n "$stack_name" ]]; then
       print_item "$p2" "Status (active) | bash=$PNPM_TERM param1=stack param2=wt param3=$stack_name param4=-- param5=status param6=$component dir=$HAPPY_LOCAL_DIR terminal=false"
@@ -518,11 +593,19 @@ render_component_repo() {
     print_item "$p2" "$wt_label"
     local p3="${p2}--"
     local tsv
-    tsv="$(git_worktrees_tsv "$active_dir" 2>/dev/null || true)"
+    if [[ "$git_mode" == "cached" && -f "$wts" ]]; then
+      tsv="$(cat "$wts" 2>/dev/null || true)"
+    else
+      tsv="$(git_worktrees_tsv "$active_dir" 2>/dev/null || true)"
+    fi
     if [[ -z "$tsv" ]]; then
       print_item "$p3" "No worktrees found | color=$GRAY"
     else
-      local root="$(resolve_components_dir)/.worktrees/$component/"
+      # Worktrees live alongside the component checkout at: <componentsRoot>/.worktrees/<component>/...
+      local components_root default_path root
+      components_root="$(dirname "$active_dir")"
+      default_path="$components_root/$component"
+      root="$components_root/.worktrees/$component/"
       local shown=0
       while IFS=$'\t' read -r wt_path wt_branchref; do
         [[ -n "$wt_path" ]] || continue
@@ -534,11 +617,13 @@ render_component_repo() {
 
         local label=""
         local spec=""
-        if [[ "$wt_path" == "$root"* ]]; then
+        if [[ "$wt_path" == "$default_path" ]]; then
+          spec="default"
+          label="default"
+        elif [[ "$wt_path" == "$root"* ]]; then
           spec="${wt_path#"$root"}"
           label="$spec"
         else
-          spec="$wt_path"
           label="$(shorten_path "$wt_path" 52)"
         fi
 
@@ -549,18 +634,24 @@ render_component_repo() {
           label="(active) $label"
         fi
 
-        if [[ "$context" == "stack" && -n "$stack_name" ]]; then
-          print_item "$p3" "$label"
-          print_item "${p3}--" "Use in stack | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=use param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
-          print_item "${p3}--" "Shell (new window) | bash=$PNPM_TERM param1=stack param2=wt param3=$stack_name param4=-- param5=shell param6=$component param7=$spec param8=--new-window dir=$HAPPY_LOCAL_DIR terminal=false"
-          print_item "${p3}--" "Open in VS Code | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=code param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
-          print_item "${p3}--" "Open in Cursor | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=cursor param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+        print_item "$p3" "$label"
+
+        # Only show "use" actions when we can express the worktree as a spec (default or under .worktrees).
+        # Some git worktrees can exist outside our managed tree; for those we only offer open/shell actions.
+        if [[ -n "$spec" ]]; then
+          if [[ "$context" == "stack" && -n "$stack_name" ]]; then
+            print_item "${p3}--" "Use in stack | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=use param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+            print_item "${p3}--" "Shell (new window) | bash=$PNPM_TERM param1=stack param2=wt param3=$stack_name param4=-- param5=shell param6=$component param7=$spec param8=--new-window dir=$HAPPY_LOCAL_DIR terminal=false"
+            print_item "${p3}--" "Open in VS Code | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=code param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+            print_item "${p3}--" "Open in Cursor | bash=$PNPM_BIN param1=stack param2=wt param3=$stack_name param4=-- param5=cursor param6=$component param7=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+          else
+            print_item "${p3}--" "Use (main) | bash=$PNPM_BIN param1=wt param2=use param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+            print_item "${p3}--" "Shell (new window) | bash=$PNPM_TERM param1=wt param2=shell param3=$component param4=$spec param5=--new-window dir=$HAPPY_LOCAL_DIR terminal=false"
+            print_item "${p3}--" "Open in VS Code | bash=$PNPM_BIN param1=wt param2=code param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+            print_item "${p3}--" "Open in Cursor | bash=$PNPM_BIN param1=wt param2=cursor param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+          fi
         else
-          print_item "$p3" "$label"
-          print_item "${p3}--" "Use (main) | bash=$PNPM_BIN param1=wt param2=use param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
-          print_item "${p3}--" "Shell (new window) | bash=$PNPM_TERM param1=wt param2=shell param3=$component param4=$spec param5=--new-window dir=$HAPPY_LOCAL_DIR terminal=false"
-          print_item "${p3}--" "Open in VS Code | bash=$PNPM_BIN param1=wt param2=code param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
-          print_item "${p3}--" "Open in Cursor | bash=$PNPM_BIN param1=wt param2=cursor param3=$component param4=$spec dir=$HAPPY_LOCAL_DIR terminal=false"
+          print_item "${p3}--" "Open folder | bash=/usr/bin/open param1='$wt_path' terminal=false"
         fi
       done <<<"$tsv"
     fi
@@ -574,26 +665,55 @@ render_components_menu() {
   local stack_name="$3"
   local env_file="$4"
 
+  local t0 t1
+  t0="$(swiftbar_now_ms 2>/dev/null || echo 0)"
+
   print_item "$prefix" "Components | sfimage=cube"
   local p2="${prefix}--"
-  local components_dir
-  components_dir="$(resolve_components_dir)"
-  if [[ ! -d "$components_dir" ]]; then
-    print_item "$p2" "Missing components dir: $(shorten_path "$components_dir" 52) | color=$GRAY"
-    return
+
+  # Background auto-refresh: keep menu refresh snappy but update git cache when TTL expires.
+  if [[ "$(git_cache_mode)" == "cached" ]]; then
+    local scope
+    scope="$(git_cache_auto_refresh_scope)"
+    local refresh="$HAPPY_LOCAL_DIR/extras/swiftbar/git-cache-refresh.sh"
+    if [[ -x "$refresh" ]]; then
+      if [[ "$scope" == "all" ]]; then
+        git_cache_maybe_refresh_async "all" "$refresh" all
+      elif [[ "$scope" == "main" && "$context" == "main" ]]; then
+        git_cache_maybe_refresh_async "main" "$refresh" main
+      fi
+    fi
   fi
 
-  local any="0"
-  for c in happy happy-cli happy-server-light happy-server; do
-    if [[ -d "$components_dir/$c" ]]; then
-      any="1"
-      render_component_repo "$p2" "$c" "$context" "$stack_name" "$env_file"
-      print_sep "$p2"
+  # Git cache controls (to keep the menu refresh fast while retaining rich inline worktrees UI).
+  local refresh="$HAPPY_LOCAL_DIR/extras/swiftbar/git-cache-refresh.sh"
+  if [[ -f "$refresh" ]]; then
+    local mode ttl
+    mode="$(git_cache_mode)"
+    ttl="$(git_cache_ttl_sec)"
+    print_item "$p2" "Git cache | sfimage=arrow.triangle.2.circlepath"
+    local p3="${p2}--"
+    print_item "$p3" "Mode: ${mode} (default: cached)"
+    print_item "$p3" "TTL: ${ttl}s (set HAPPY_STACKS_SWIFTBAR_GIT_TTL_SEC)"
+    print_sep "$p3"
+    if [[ "$context" == "main" ]]; then
+      print_item "$p3" "Refresh now (main components) | bash=$refresh param1=main dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      print_item "$p3" "Refresh now (all stacks/components) | bash=$refresh param1=all dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+    else
+      print_item "$p3" "Refresh now (this stack) | bash=$refresh param1=stack param2=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     fi
-  done
-  if [[ "$any" == "0" ]]; then
-    print_item "$p2" "No components found under components/ | color=$GRAY"
+    print_sep "$p2"
   fi
+
+  # Always render the known components using the resolved component dirs (env file → env.local/.env → fallback),
+  # instead of assuming they live under `~/.happy-stacks/workspace/components`.
+  for c in happy happy-cli happy-server-light happy-server; do
+    render_component_repo "$p2" "$c" "$context" "$stack_name" "$env_file"
+    print_sep "$p2"
+  done
+
+  t1="$(swiftbar_now_ms 2>/dev/null || echo 0)"
+  swiftbar_profile_log "time" "label=render_components_menu" "context=${context}" "stack=${stack_name}" "ms=$((t1 - t0))"
 }
 
 render_stack_overview_item() {
@@ -644,14 +764,20 @@ collect_stack_status() {
   daemon_uptime="$(get_daemon_uptime "$cli_home_dir")"
   last_heartbeat="$(get_last_heartbeat "$cli_home_dir")"
 
-  local plist_path="$HOME/Library/LaunchAgents/${label}.plist"
   local launchagent_status autostart_pid autostart_metrics
-  launchagent_status="$(check_launchagent_status "$label" "$plist_path")"
-  autostart_pid=""
-  autostart_metrics=""
-  if [[ "$launchagent_status" != "not_installed" ]]; then
-    autostart_pid="$(launchagent_pid_for_label "$label")"
-    autostart_metrics="$(get_process_metrics "$autostart_pid")"
+  if swiftbar_is_sandboxed; then
+    launchagent_status="sandbox_disabled"
+    autostart_pid=""
+    autostart_metrics=""
+  else
+    local plist_path="$HOME/Library/LaunchAgents/${label}.plist"
+    launchagent_status="$(check_launchagent_status "$label" "$plist_path")"
+    autostart_pid=""
+    autostart_metrics=""
+    if [[ "$launchagent_status" != "not_installed" ]]; then
+      autostart_pid="$(launchagent_pid_for_label "$label")"
+      autostart_metrics="$(get_process_metrics "$autostart_pid")"
+    fi
   fi
 
   local level
@@ -688,10 +814,21 @@ render_stack_info() {
   local tailscale_url="$9"  # optional
 
   # Avoid low-contrast gray in the main list; keep it readable in both light/dark.
-  print_item "$prefix" "Stack details | sfimage=info.circle"
+  print_item "$prefix" "Stack details | sfimage=server.rack"
   local p2="${prefix}--"
   print_item "$p2" "Server component: ${server_component}"
-  print_item "$p2" "Port: ${port}"
+  local pinned_port=""
+  if [[ -n "$env_file" && -f "$env_file" ]]; then
+    pinned_port="$(dotenv_get "$env_file" "HAPPY_STACKS_SERVER_PORT")"
+    [[ -z "$pinned_port" ]] && pinned_port="$(dotenv_get "$env_file" "HAPPY_LOCAL_SERVER_PORT")"
+  fi
+  local port_display="$port"
+  if [[ -z "$port_display" ]]; then
+    port_display="ephemeral (not running)"
+  elif [[ -z "$pinned_port" ]]; then
+    port_display="${port_display} (ephemeral)"
+  fi
+  print_item "$p2" "Port: ${port_display}"
   print_item "$p2" "Label: ${label}"
   [[ -n "$env_file" ]] && print_item "$p2" "Env: $(shorten_path "$env_file" 52)"
   [[ -n "$tailscale_url" ]] && print_item "$p2" "Tailscale: $(shorten_text "$tailscale_url" 52)"
@@ -718,12 +855,16 @@ render_stack_info() {
   fi
   print_sep "$p2"
 
-  local plist="$HOME/Library/LaunchAgents/${label}.plist"
   local svc_installed="0"
-  [[ -f "$plist" ]] && svc_installed="1"
+  if ! swiftbar_is_sandboxed; then
+    local plist="$HOME/Library/LaunchAgents/${label}.plist"
+    [[ -f "$plist" ]] && svc_installed="1"
+  fi
+  local menu_mode
+  menu_mode="$(resolve_menubar_mode)"
 
   if [[ "$stack_name" == "main" ]]; then
-    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+    local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
     if [[ "$svc_installed" == "1" ]]; then
       # Status-aware: only show start/stop based on whether the stack is running.
       if [[ "${MAIN_LEVEL:-}" == "red" ]]; then
@@ -736,16 +877,18 @@ render_stack_info() {
       if [[ "${MAIN_LEVEL:-}" == "red" ]]; then
         print_item "$p2" "Start (foreground) | bash=$PNPM_TERM param1=start dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
       else
-        print_item "$p2" "Stop (kill port listeners) | bash=$PNPM_TERM param1=stack:fix dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+        print_item "$p2" "Stop stack | bash=$PNPM_BIN param1=stack param2=stop param3=main dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
       fi
     fi
-    print_item "$p2" "Dev mode | bash=$PNPM_TERM param1=dev dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+    if [[ "$menu_mode" != "selfhost" ]]; then
+      print_item "$p2" "Dev mode | bash=$PNPM_TERM param1=dev dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+    fi
     print_item "$p2" "Build UI | bash=$PNPM_TERM param1=build dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     print_item "$p2" "Doctor | bash=$PNPM_TERM param1=stack:doctor dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     return
   fi
 
-  local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm-term.sh"
+  local PNPM_TERM="$HAPPY_LOCAL_DIR/extras/swiftbar/happys-term.sh"
   if [[ "$svc_installed" == "1" ]]; then
     # Status-aware: only show start/stop based on whether the stack is running.
     if [[ "$STACK_LEVEL" == "red" ]]; then
@@ -758,17 +901,21 @@ render_stack_info() {
     if [[ "$STACK_LEVEL" == "red" ]]; then
       print_item "$p2" "Start (foreground) | bash=$PNPM_TERM param1=stack param2=start param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     else
-      print_item "$p2" "Stop (kill port listeners) | bash=$PNPM_TERM param1=stack param2=fix param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+      print_item "$p2" "Stop stack | bash=$PNPM_BIN param1=stack param2=stop param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
     fi
   fi
-  print_item "$p2" "Dev mode | bash=$PNPM_TERM param1=stack param2=dev param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+  if [[ "$menu_mode" != "selfhost" ]]; then
+    print_item "$p2" "Dev mode | bash=$PNPM_TERM param1=stack param2=dev param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+  fi
   print_item "$p2" "Build UI | bash=$PNPM_TERM param1=stack param2=build param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
   print_item "$p2" "Doctor | bash=$PNPM_TERM param1=stack param2=doctor param3=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
-  print_item "$p2" "Edit stack (interactive) | bash=$PNPM_TERM param1=stack param2=edit param3=$stack_name param4=--interactive dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
-  print_item "$p2" "Select worktrees (interactive) | bash=$PNPM_TERM param1=stack param2=wt param3=$stack_name param4=-- param5=use param6=--interactive dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+  if [[ "$menu_mode" != "selfhost" ]]; then
+    print_item "$p2" "Edit stack (interactive) | bash=$PNPM_TERM param1=stack param2=edit param3=$stack_name param4=--interactive dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+    print_item "$p2" "Select worktrees (interactive) | bash=$PNPM_TERM param1=stack param2=wt param3=$stack_name param4=-- param5=use param6=--interactive dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
+  fi
 
   local pr_helper="$HAPPY_LOCAL_DIR/extras/swiftbar/wt-pr.sh"
-  if [[ -x "$pr_helper" ]]; then
+  if [[ "$menu_mode" != "selfhost" && -x "$pr_helper" ]]; then
     print_item "$p2" "PR worktree into this stack (prompt) | bash=$pr_helper param1=_prompt_ param2=$stack_name dir=$HAPPY_LOCAL_DIR terminal=false refresh=true"
   fi
 }