happy-stacks 0.0.0 → 0.1.2

package/extras/swiftbar/happys.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -euo pipefail
+
+# SwiftBar menu action wrapper.
+# Runs `happys` using the stable shim installed under ~/.happy-stacks/bin.
+
+CANONICAL_ENV_FILE="$HOME/.happy-stacks/.env"
+
+dotenv_get_quick() {
+  local file="$1"
+  local key="$2"
+  [[ -n "$file" && -n "$key" && -f "$file" ]] || return 0
+  local line
+  line="$(grep -E "^${key}=" "$file" 2>/dev/null | head -n 1 || true)"
+  [[ -n "$line" ]] || return 0
+  local v="${line#*=}"
+  v="${v%$'\r'}"
+  if [[ "$v" == \"*\" && "$v" == *\" ]]; then v="${v#\"}"; v="${v%\"}"; fi
+  if [[ "$v" == \'*\' && "$v" == *\' ]]; then v="${v#\'}"; v="${v%\'}"; fi
+  echo "$v"
+}
+
+expand_home_quick() {
+  local p="$1"
+  if [[ "$p" == "~/"* ]]; then
+    echo "$HOME/${p#~/}"
+  else
+    echo "$p"
+  fi
+}
+
+home_from_canonical=""
+if [[ -f "$CANONICAL_ENV_FILE" ]]; then
+  home_from_canonical="$(dotenv_get_quick "$CANONICAL_ENV_FILE" "HAPPY_STACKS_HOME_DIR")"
+  [[ -z "$home_from_canonical" ]] && home_from_canonical="$(dotenv_get_quick "$CANONICAL_ENV_FILE" "HAPPY_LOCAL_HOME_DIR")"
+fi
+home_from_canonical="$(expand_home_quick "${home_from_canonical:-}")"
+
+HAPPY_STACKS_HOME_DIR="${HAPPY_STACKS_HOME_DIR:-${home_from_canonical:-$HOME/.happy-stacks}}"
+HAPPY_LOCAL_DIR="${HAPPY_LOCAL_DIR:-$HAPPY_STACKS_HOME_DIR}"
+
+HAPPYS_BIN="$HAPPY_LOCAL_DIR/bin/happys"
+if [[ ! -x "$HAPPYS_BIN" ]]; then
+  HAPPYS_BIN="$(command -v happys 2>/dev/null || true)"
+fi
+
+if [[ -z "${HAPPYS_BIN:-}" ]]; then
+  echo "happys not found (run: npx happy-stacks init, or npm i -g happy-stacks)" >&2
+  exit 1
+fi
+
+exec "$HAPPYS_BIN" "$@"

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,8 +74,8 @@ 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"
@@ -85,7 +99,7 @@ render_component_server() {
 
   # 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
@@ -130,7 +144,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 +173,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"
@@ -194,14 +209,16 @@ render_component_daemon() {
         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"
       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"
+        print_item "$p2" "Auth login (opens browser) | bash=$auth_helper param1=$stack_name param2=$server_url param3=$webapp_url dir=$HAPPY_LOCAL_DIR terminal=false refresh=false"
       fi
       print_sep "$p2"
     fi
@@ -227,8 +244,8 @@ render_component_autostart() {
   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 +309,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
@@ -312,7 +329,7 @@ render_component_tailscale() {
   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 +340,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"
@@ -345,7 +362,8 @@ render_component_repo() {
   local env_file="$5"
 
   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")"
@@ -383,7 +401,7 @@ render_component_repo() {
     print_item "$p2" "Status: not a git repo / missing"
     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
@@ -457,15 +475,15 @@ render_component_repo() {
     fi
   fi
 
-  local wt_count
-  wt_count="$(git_worktree_count "$active_dir")"
+    local wt_count
+    wt_count="$(git_worktree_count "$active_dir")"
 
   # 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"
@@ -522,7 +540,11 @@ render_component_repo() {
     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 +556,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 +573,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
@@ -576,24 +606,12 @@ render_components_menu() {
 
   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
-  fi
-
-  local any="0"
+  # 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
-    if [[ -d "$components_dir/$c" ]]; then
-      any="1"
-      render_component_repo "$p2" "$c" "$context" "$stack_name" "$env_file"
-      print_sep "$p2"
-    fi
+    render_component_repo "$p2" "$c" "$context" "$stack_name" "$env_file"
+    print_sep "$p2"
   done
-  if [[ "$any" == "0" ]]; then
-    print_item "$p2" "No components found under components/ | color=$GRAY"
-  fi
 }
 
 render_stack_overview_item() {
@@ -688,7 +706,7 @@ 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}"
@@ -723,7 +741,7 @@ render_stack_info() {
   [[ -f "$plist" ]] && svc_installed="1"
 
   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
@@ -745,7 +763,7 @@ render_stack_info() {
     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

package/extras/swiftbar/lib/system.sh

@@ -112,7 +112,7 @@ check_daemon_status() {
           local latest_log
           latest_log="$(ls -1t "$cli_home_dir"/logs/*-daemon.log 2>/dev/null | head -1 || true)"
           if [[ -n "$latest_log" ]]; then
-            if tail -n 120 "$latest_log" 2>/dev/null | rg -q "No credentials found|starting authentication flow|Waiting for credentials"; then
+            if tail -n 120 "$latest_log" 2>/dev/null | grep -Eq "No credentials found|starting authentication flow|Waiting for credentials"; then
               echo "auth_required:$lock_pid"
               return
             fi
@@ -129,9 +129,16 @@ check_daemon_status() {
     return
   fi
 
+  local node_bin
+  node_bin="$(resolve_node_bin)"
+  if [[ -z "$node_bin" ]] || [[ ! -x "$node_bin" ]]; then
+    echo "unknown"
+    return
+  fi
+
   local pid httpPort
-  pid="$(node -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.stdout.write(String(s.pid ?? ""));' "$state_file" 2>/dev/null || true)"
-  httpPort="$(node -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.stdout.write(String(s.httpPort ?? ""));' "$state_file" 2>/dev/null || true)"
+  pid="$("$node_bin" -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.stdout.write(String(s.pid ?? ""));' "$state_file" 2>/dev/null || true)"
+  httpPort="$("$node_bin" -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); process.stdout.write(String(s.httpPort ?? ""));' "$state_file" 2>/dev/null || true)"
 
   if [[ -z "$pid" ]] || ! [[ "$pid" =~ ^[0-9]+$ ]]; then
     echo "unknown"
@@ -162,7 +169,12 @@ get_daemon_uptime() {
   if [[ -z "$cli_home_dir" ]] || [[ ! -f "$state_file" ]]; then
     return
   fi
-  node -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); if (s.startTime) process.stdout.write(String(s.startTime));' "$state_file" 2>/dev/null || true
+  local node_bin
+  node_bin="$(resolve_node_bin)"
+  if [[ -z "$node_bin" ]] || [[ ! -x "$node_bin" ]]; then
+    return
+  fi
+  "$node_bin" -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); if (s.startTime) process.stdout.write(String(s.startTime));' "$state_file" 2>/dev/null || true
 }
 
 get_last_heartbeat() {
@@ -171,20 +183,39 @@ get_last_heartbeat() {
   if [[ -z "$cli_home_dir" ]] || [[ ! -f "$state_file" ]]; then
     return
   fi
-  node -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); if (s.lastHeartbeat) process.stdout.write(String(s.lastHeartbeat));' "$state_file" 2>/dev/null || true
+  local node_bin
+  node_bin="$(resolve_node_bin)"
+  if [[ -z "$node_bin" ]] || [[ ! -x "$node_bin" ]]; then
+    return
+  fi
+  "$node_bin" -e 'const fs=require("fs"); const s=JSON.parse(fs.readFileSync(process.argv[1],"utf8")); if (s.lastHeartbeat) process.stdout.write(String(s.lastHeartbeat));' "$state_file" 2>/dev/null || true
 }
 
 get_tailscale_url() {
   # Try multiple methods to get the Tailscale URL (best-effort).
   local url=""
 
+  # Preferred: use happys (respects our own timeouts/env handling).
+  local happys_sh="$HAPPY_LOCAL_DIR/extras/swiftbar/happys.sh"
+  if [[ -x "$happys_sh" ]]; then
+    # Keep SwiftBar responsive: use a tight timeout for this periodic probe.
+    url="$("$happys_sh" tailscale:url --timeout-ms=2500 2>/dev/null | head -1 | tr -d '[:space:]' || true)"
+    if [[ "$url" == https://* ]]; then
+      echo "$url"
+      return
+    fi
+    url=""
+  fi
+
   if command -v tailscale &>/dev/null; then
     url="$(tailscale serve status 2>/dev/null | grep -oE 'https://[^ ]+' | head -1 || true)"
   fi
+  if [[ -z "$url" ]] && [[ -x "/Applications/Tailscale.app/Contents/MacOS/tailscale" ]]; then
+    url="$(/Applications/Tailscale.app/Contents/MacOS/tailscale serve status 2>/dev/null | grep -oE 'https://[^ ]+' | head -1 || true)"
+  fi
   if [[ -z "$url" ]] && [[ -x "/Applications/Tailscale.app/Contents/MacOS/Tailscale" ]]; then
     url="$(/Applications/Tailscale.app/Contents/MacOS/Tailscale serve status 2>/dev/null | grep -oE 'https://[^ ]+' | head -1 || true)"
   fi
 
   echo "$url"
 }
-

package/extras/swiftbar/lib/utils.sh

@@ -50,6 +50,15 @@ dotenv_get() {
   ' "$file" 2>/dev/null
 }
 
+expand_home_path() {
+  local p="$1"
+  if [[ "$p" == "~/"* ]]; then
+    echo "$HOME/${p#~/}"
+    return
+  fi
+  echo "$p"
+}
+
 resolve_happy_local_dir() {
   local home="${HAPPY_STACKS_HOME_DIR:-$HOME/.happy-stacks}"
 
@@ -69,9 +78,130 @@ resolve_happy_local_dir() {
   echo "$home"
 }
 
+resolve_stacks_storage_root() {
+  # Priority:
+  # 1) explicit env var
+  # 2) home env.local
+  # 3) home .env (canonical pointer file, written by `happys init`)
+  # 4) default to ~/.happy/stacks
+  if [[ -n "${HAPPY_STACKS_STORAGE_DIR:-}" ]]; then
+    echo "$(expand_home_path "$HAPPY_STACKS_STORAGE_DIR")"
+    return
+  fi
+  if [[ -n "${HAPPY_LOCAL_STORAGE_DIR:-}" ]]; then
+    echo "$(expand_home_path "$HAPPY_LOCAL_STORAGE_DIR")"
+    return
+  fi
+
+  local p
+  p="$(dotenv_get "$HAPPY_LOCAL_DIR/env.local" "HAPPY_STACKS_STORAGE_DIR")"
+  [[ -z "$p" ]] && p="$(dotenv_get "$HAPPY_LOCAL_DIR/env.local" "HAPPY_LOCAL_STORAGE_DIR")"
+  [[ -z "$p" ]] && p="$(dotenv_get "$HAPPY_LOCAL_DIR/.env" "HAPPY_STACKS_STORAGE_DIR")"
+  [[ -z "$p" ]] && p="$(dotenv_get "$HAPPY_LOCAL_DIR/.env" "HAPPY_LOCAL_STORAGE_DIR")"
+  if [[ -n "$p" ]]; then
+    echo "$(expand_home_path "$p")"
+    return
+  fi
+
+  echo "$HOME/.happy/stacks"
+}
+
+resolve_stack_env_file() {
+  local stack_name="${1:-main}"
+  local storage_root
+  storage_root="$(resolve_stacks_storage_root)"
+
+  local primary="${storage_root}/${stack_name}/env"
+  if [[ -f "$primary" ]]; then
+    echo "$primary"
+    return
+  fi
+
+  local legacy="$HOME/.happy/local/stacks/${stack_name}/env"
+  if [[ -f "$legacy" ]]; then
+    echo "$legacy"
+    return
+  fi
+
+  # Very old single-stack location (best-effort).
+  if [[ "$stack_name" == "main" ]]; then
+    local legacy_single="$HOME/.happy/local/env"
+    if [[ -f "$legacy_single" ]]; then
+      echo "$legacy_single"
+      return
+    fi
+  fi
+
+  echo "$primary"
+}
+
+resolve_stack_base_dir() {
+  local stack_name="${1:-main}"
+  local env_file="${2:-}"
+  if [[ -z "$env_file" ]]; then
+    env_file="$(resolve_stack_env_file "$stack_name")"
+  fi
+  # If the env file exists, its parent directory is the stack base dir for all supported layouts.
+  if [[ -n "$env_file" ]] && [[ -f "$env_file" ]]; then
+    dirname "$env_file"
+    return
+  fi
+  local storage_root
+  storage_root="$(resolve_stacks_storage_root)"
+  echo "${storage_root}/${stack_name}"
+}
+
+resolve_stack_cli_home_dir() {
+  local stack_name="${1:-main}"
+  local env_file="${2:-}"
+  if [[ -z "$env_file" ]]; then
+    env_file="$(resolve_stack_env_file "$stack_name")"
+  fi
+  local cli_home=""
+  if [[ -n "$env_file" ]] && [[ -f "$env_file" ]]; then
+    cli_home="$(dotenv_get "$env_file" "HAPPY_STACKS_CLI_HOME_DIR")"
+    [[ -z "$cli_home" ]] && cli_home="$(dotenv_get "$env_file" "HAPPY_LOCAL_CLI_HOME_DIR")"
+  fi
+  if [[ -n "$cli_home" ]]; then
+    echo "$(expand_home_path "$cli_home")"
+    return
+  fi
+  local base_dir
+  base_dir="$(resolve_stack_base_dir "$stack_name" "$env_file")"
+  echo "${base_dir}/cli"
+}
+
+resolve_stack_label() {
+  local stack_name="${1:-main}"
+  local primary="com.happy.stacks"
+  local legacy="com.happy.local"
+  if [[ "$stack_name" != "main" ]]; then
+    primary="com.happy.stacks.${stack_name}"
+    legacy="com.happy.local.${stack_name}"
+  fi
+  local primary_plist="$HOME/Library/LaunchAgents/${primary}.plist"
+  local legacy_plist="$HOME/Library/LaunchAgents/${legacy}.plist"
+  if [[ -f "$primary_plist" ]]; then
+    echo "$primary"
+    return
+  fi
+  if [[ -f "$legacy_plist" ]]; then
+    echo "$legacy"
+    return
+  fi
+  echo "$primary"
+}
+
 resolve_pnpm_bin() {
-  # Back-compat: historically this was "pnpm", but the plugin now runs `happys` via a wrapper script.
-  local wrapper="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm.sh"
+  # Back-compat: historically this was "pnpm", but the plugin now runs `happys` via wrapper scripts.
+  local wrapper="$HAPPY_LOCAL_DIR/extras/swiftbar/happys.sh"
+  if [[ -x "$wrapper" ]]; then
+    echo "$wrapper"
+    return
+  fi
+
+  # Older installs.
+  wrapper="$HAPPY_LOCAL_DIR/extras/swiftbar/pnpm.sh"
   if [[ -x "$wrapper" ]]; then
     echo "$wrapper"
     return
@@ -87,6 +217,37 @@ resolve_pnpm_bin() {
   echo ""
 }
 
+resolve_node_bin() {
+  # Prefer explicit env vars first.
+  if [[ -n "${HAPPY_STACKS_NODE:-}" ]] && [[ -x "${HAPPY_STACKS_NODE:-}" ]]; then
+    echo "$HAPPY_STACKS_NODE"
+    return
+  fi
+  if [[ -n "${HAPPY_LOCAL_NODE:-}" ]] && [[ -x "${HAPPY_LOCAL_NODE:-}" ]]; then
+    echo "$HAPPY_LOCAL_NODE"
+    return
+  fi
+
+  # Fall back to reading ~/.happy-stacks/.env (written by `happys init`).
+  local home="${HAPPY_STACKS_HOME_DIR:-$HOME/.happy-stacks}"
+  local env_file="$home/.env"
+  if [[ -f "$env_file" ]]; then
+    local v
+    v="$(dotenv_get "$env_file" "HAPPY_STACKS_NODE")"
+    if [[ -n "$v" ]] && [[ -x "$v" ]]; then
+      echo "$v"
+      return
+    fi
+    v="$(dotenv_get "$env_file" "HAPPY_LOCAL_NODE")"
+    if [[ -n "$v" ]] && [[ -x "$v" ]]; then
+      echo "$v"
+      return
+    fi
+  fi
+
+  command -v node 2>/dev/null || true
+}
+
 resolve_workspace_dir() {
   if [[ -n "${HAPPY_STACKS_WORKSPACE_DIR:-}" ]]; then
     echo "$HAPPY_STACKS_WORKSPACE_DIR"
@@ -112,18 +273,33 @@ resolve_main_env_file() {
     echo "$explicit"
     return
   fi
-  local main="$HOME/.happy/stacks/main/env"
+
+  local storage_root
+  storage_root="$(resolve_stacks_storage_root)"
+  local main="$storage_root/main/env"
   if [[ -f "$main" ]]; then
     echo "$main"
     return
   fi
+  # Legacy stacks location (pre-migration).
+  local legacy="$HOME/.happy/local/stacks/main/env"
+  if [[ -f "$legacy" ]]; then
+    echo "$legacy"
+    return
+  fi
+  # Very old single-stack location (best-effort).
+  local legacy_single="$HOME/.happy/local/env"
+  if [[ -f "$legacy_single" ]]; then
+    echo "$legacy_single"
+    return
+  fi
   echo ""
 }
 
 resolve_main_port() {
   # Priority:
   # 1) explicit env var
-  # 2) main stack env (~/.happy/stacks/main/env)
+  # 2) main stack env
   # 3) home env.local
   # 4) home .env
   # 4) fallback to HAPPY_LOCAL_PORT / 3005