@happier-dev/stack 0.1.0-preview.96.1 → 0.2.0-preview.1775370152.55749

package/extras/swiftbar/lib/system.sh

@@ -36,6 +36,150 @@ get_port_listener_pid() {
 # Cached launchctl output for speed across many stacks.
 LAUNCHCTL_LIST_CACHE=""
 
+resolve_daemon_state_helper_module() {
+  local repo_root="${HAPPIER_STACK_CLI_ROOT_DIR:-}"
+  if [[ -z "$repo_root" ]]; then
+    repo_root="${HAPPIER_STACK_REPO_DIR:-}"
+  fi
+  if [[ -z "$repo_root" ]] && [[ -n "${HAPPIER_STACK_ENV_FILE:-}" ]] && [[ -f "${HAPPIER_STACK_ENV_FILE:-}" ]]; then
+    repo_root="$(dotenv_get "${HAPPIER_STACK_ENV_FILE:-}" "HAPPIER_STACK_REPO_DIR")"
+  fi
+
+  local install_root
+  install_root="$(resolve_hstack_root_dir)"
+
+  local helper=""
+  local candidates=()
+  if [[ -n "$repo_root" ]]; then
+    candidates+=("$repo_root/apps/stack/scripts/utils/auth/credentials_paths.mjs")
+    candidates+=("$repo_root/scripts/utils/auth/credentials_paths.mjs")
+  fi
+  if [[ -n "$install_root" ]]; then
+    candidates+=("$install_root/scripts/utils/auth/credentials_paths.mjs")
+    candidates+=("$install_root/runtime/node_modules/@happier-dev/stack/scripts/utils/auth/credentials_paths.mjs")
+    candidates+=("$install_root/node_modules/@happier-dev/stack/scripts/utils/auth/credentials_paths.mjs")
+  fi
+
+  local candidate
+  for candidate in "${candidates[@]}"; do
+    if [[ -f "$candidate" ]]; then
+      helper="$candidate"
+      break
+    fi
+  done
+
+  [[ -n "$helper" ]] || return
+  echo "$helper"
+}
+
+resolve_tailscale_status_helper_module() {
+  local repo_root="${HAPPIER_STACK_CLI_ROOT_DIR:-}"
+  if [[ -z "$repo_root" ]]; then
+    repo_root="${HAPPIER_STACK_REPO_DIR:-}"
+  fi
+  if [[ -z "$repo_root" ]] && [[ -n "${HAPPIER_STACK_ENV_FILE:-}" ]] && [[ -f "${HAPPIER_STACK_ENV_FILE:-}" ]]; then
+    repo_root="$(dotenv_get "${HAPPIER_STACK_ENV_FILE:-}" "HAPPIER_STACK_REPO_DIR")"
+  fi
+
+  local install_root
+  install_root="$(resolve_hstack_root_dir)"
+
+  local helper=""
+  local candidates=()
+  if [[ -n "$repo_root" ]]; then
+    candidates+=("$repo_root/apps/stack/scripts/utils/tailscale/extract_https_url_from_status.mjs")
+    candidates+=("$repo_root/scripts/utils/tailscale/extract_https_url_from_status.mjs")
+  fi
+  if [[ -n "$install_root" ]]; then
+    candidates+=("$install_root/scripts/utils/tailscale/extract_https_url_from_status.mjs")
+    candidates+=("$install_root/runtime/node_modules/@happier-dev/stack/scripts/utils/tailscale/extract_https_url_from_status.mjs")
+    candidates+=("$install_root/node_modules/@happier-dev/stack/scripts/utils/tailscale/extract_https_url_from_status.mjs")
+  fi
+
+  local candidate
+  for candidate in "${candidates[@]}"; do
+    if [[ -f "$candidate" ]]; then
+      helper="$candidate"
+      break
+    fi
+  done
+
+  [[ -n "$helper" ]] || return
+  echo "$helper"
+}
+
+extract_tailscale_url_from_status_text() {
+  local status_text="$1"
+  if [[ -z "$status_text" ]]; then
+    echo ""
+    return
+  fi
+
+  local node_bin
+  node_bin="$(resolve_node_bin)"
+  if [[ -z "$node_bin" ]] || [[ ! -x "$node_bin" ]]; then
+    echo ""
+    return
+  fi
+
+  local helper
+  helper="$(resolve_tailscale_status_helper_module)"
+  if [[ ! -f "$helper" ]]; then
+    echo ""
+    return
+  fi
+
+  local resolved
+  resolved="$(printf '%s' "$status_text" | "$node_bin" --input-type=module -e '
+    const { readFileSync } = await import("node:fs");
+    const { pathToFileURL } = await import("node:url");
+    const helperUrl = pathToFileURL(process.argv[1]).href;
+    const { extractTailscaleHttpsUrlFromStatusText } = await import(helperUrl);
+    const input = readFileSync(0, "utf8");
+    const url = extractTailscaleHttpsUrlFromStatusText(input);
+    if (url) {
+      process.stdout.write(url);
+    }
+  ' "$helper" 2>/dev/null || true)"
+  echo "$resolved"
+}
+
+resolve_preferred_daemon_state_pair() {
+  local cli_home_dir="$1"
+  if [[ -z "$cli_home_dir" ]]; then
+    return
+  fi
+
+  local node_bin
+  node_bin="$(resolve_node_bin)"
+  if [[ -z "$node_bin" ]] || [[ ! -x "$node_bin" ]]; then
+    echo "$cli_home_dir/daemon.state.json|$cli_home_dir/daemon.state.json.lock"
+    return
+  fi
+
+  local helper
+  helper="$(resolve_daemon_state_helper_module)"
+  if [[ ! -f "$helper" ]]; then
+    echo "$cli_home_dir/daemon.state.json|$cli_home_dir/daemon.state.json.lock"
+    return
+  fi
+
+  local resolved
+  resolved="$("$node_bin" --input-type=module -e '
+    const { pathToFileURL } = await import("node:url");
+    const helperUrl = pathToFileURL(process.argv[1]).href;
+    const { resolvePreferredStackDaemonStatePaths } = await import(helperUrl);
+    const out = resolvePreferredStackDaemonStatePaths({ cliHomeDir: process.argv[2], env: process.env });
+    process.stdout.write(`${out.statePath}|${out.lockPath}`);
+  ' "$helper" "$cli_home_dir" 2>/dev/null || true)"
+  if [[ -n "$resolved" ]]; then
+    echo "$resolved"
+    return
+  fi
+
+  echo "$cli_home_dir/daemon.state.json|$cli_home_dir/daemon.state.json.lock"
+}
+
 ensure_launchctl_cache() {
   if [[ -n "$LAUNCHCTL_LIST_CACHE" ]]; then
     return
@@ -105,13 +249,15 @@ check_server_health() {
 
 check_daemon_status() {
   local cli_home_dir="$1"
-  local state_file="$cli_home_dir/daemon.state.json"
+  local resolved state_file lock_file
+  resolved="$(resolve_preferred_daemon_state_pair "$cli_home_dir")"
+  state_file="${resolved%%|*}"
+  lock_file="${resolved#*|}"
   local t0 t1
   t0="$(swiftbar_now_ms 2>/dev/null || echo 0)"
   if [[ -z "$cli_home_dir" ]] || [[ ! -f "$state_file" ]]; then
     # If the daemon is starting but hasn't written daemon.state.json yet, we can still detect it
     # via the lock file PID.
-    local lock_file="$cli_home_dir/daemon.state.json.lock"
     if [[ -f "$lock_file" ]]; then
       local lock_pid
       lock_pid="$(cat "$lock_file" 2>/dev/null | tr -d '[:space:]')"
@@ -180,7 +326,9 @@ check_daemon_status() {
 
 get_daemon_uptime() {
   local cli_home_dir="$1"
-  local state_file="$cli_home_dir/daemon.state.json"
+  local resolved state_file
+  resolved="$(resolve_preferred_daemon_state_pair "$cli_home_dir")"
+  state_file="${resolved%%|*}"
   if [[ -z "$cli_home_dir" ]] || [[ ! -f "$state_file" ]]; then
     return
   fi
@@ -194,7 +342,9 @@ get_daemon_uptime() {
 
 get_last_heartbeat() {
   local cli_home_dir="$1"
-  local state_file="$cli_home_dir/daemon.state.json"
+  local resolved state_file
+  resolved="$(resolve_preferred_daemon_state_pair "$cli_home_dir")"
+  state_file="${resolved%%|*}"
   if [[ -z "$cli_home_dir" ]] || [[ ! -f "$state_file" ]]; then
     return
   fi
@@ -228,16 +378,18 @@ get_tailscale_url() {
 
   if command -v tailscale &>/dev/null; then
     local t0 t1
+    local status_text
     t0="$(swiftbar_now_ms 2>/dev/null || echo 0)"
-    url="$(tailscale serve status 2>/dev/null | grep -oE 'https://[^ ]+' | head -1 || true)"
+    status_text="$(tailscale serve status 2>/dev/null || true)"
+    url="$(extract_tailscale_url_from_status_text "$status_text")"
     t1="$(swiftbar_now_ms 2>/dev/null || echo 0)"
     swiftbar_profile_log "time" "label=tailscale_url_cli" "ms=$((t1 - t0))" "ok=$([[ -n "$url" ]] && echo 1 || echo 0)"
   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)"
+    url="$(extract_tailscale_url_from_status_text "$(/Applications/Tailscale.app/Contents/MacOS/tailscale serve status 2>/dev/null || 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)"
+    url="$(extract_tailscale_url_from_status_text "$(/Applications/Tailscale.app/Contents/MacOS/Tailscale serve status 2>/dev/null || true)")"
   fi
 
   echo "$url"

package/extras/swiftbar/lib/utils.sh

@@ -427,9 +427,9 @@ resolve_stack_cli_home_dir() {
 
 resolve_stack_label() {
   local stack_name="${1:-main}"
-  local primary="com.happier.stack"
+  local primary="dev.happier.stack"
   if [[ "$stack_name" != "main" ]]; then
-    primary="com.happier.stack.${stack_name}"
+    primary="dev.happier.stack.${stack_name}"
   fi
   if swiftbar_is_sandboxed; then
     # Never inspect global LaunchAgents in sandbox mode.

package/node_modules/@happier-dev/agents/README.md

@@ -0,0 +1,4 @@
+# @happier-dev/agents
+
+Internal workspace package for shared agent identifiers/configuration.
+