browser4-cli 0.1.14 → 0.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browser4-cli",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Browser automation CLI for AI agents",
   "type": "module",
   "files": [

package/scripts/install-browser4-cli.ps1

@@ -67,9 +67,17 @@ $ErrorActionPreference = "Stop"
 # OS detection (compatible with PS 5.1+)
 # ──────────────────────────────────────────────
 
-$script:IsWin = [System.Environment]::OSVersion.Platform -eq "Win32NT"
-$script:IsMac = [System.Environment]::OSVersion.Platform -eq "Unix" -and (uname -s 2>$null) -eq "Darwin"
-$script:IsLinux = [System.Environment]::OSVersion.Platform -eq "Unix" -and (uname -s 2>$null) -ne "Darwin"
+# Avoid assigning to $IsLinux / $IsWindows / $IsMacOS directly —
+# they are read-only automatic variables in PowerShell 7+.
+if ($PSVersionTable.PSVersion.Major -ge 6) {
+    $script:OSWin   = $IsWindows
+    $script:OSLinux = $IsLinux
+    $script:OSMac   = $IsMacOS
+} else {
+    $script:OSWin   = [System.Environment]::OSVersion.Platform -eq "Win32NT"
+    $script:OSMac   = $false
+    $script:OSLinux = $false
+}
 
 # ──────────────────────────────────────────────
 # Helpers
@@ -102,13 +110,13 @@ function Write-WarnMsg {
 function Get-PlatformKey {
   $arch = if ([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture -eq [System.Runtime.InteropServices.Architecture]::Arm64) { "arm64" } else { "x64" }
 
-  if ($script:IsWin) {
+  if ($script:OSWin) {
     return "win32-$arch"
   }
-  elseif ($script:IsMac) {
+  elseif ($script:OSMac) {
     return "darwin-$arch"
   }
-  elseif ($script:IsLinux) {
+  elseif ($script:OSLinux) {
     # Detect musl
     $isMusl = $false
     try {
@@ -133,10 +141,10 @@ function Get-BinaryName {
 }
 
 function Get-DefaultInstallDir {
-  if ($script:IsWin) {
+  if ($script:OSWin) {
     return Join-Path $env:LOCALAPPDATA "Programs\browser4-cli"
   }
-  elseif ($script:IsLinux -or $script:IsMac) {
+  elseif ($script:OSLinux -or $script:OSMac) {
     # Prefer ~/.local/bin for user installs
     if (Test-Path "$env:HOME/.local/bin") {
       return "$env:HOME/.local/bin"
@@ -233,7 +241,7 @@ function New-PlatformLink {
   }
 
   # Try hard link (Windows, same volume)
-  if ($script:IsWin) {
+  if ($script:OSWin) {
     try {
       $targetPath = Join-Path (Split-Path $LinkPath -Parent) $TargetName
       New-Item -ItemType HardLink -Path $LinkPath -Target $targetPath -Force -ErrorAction Stop | Out-Null
@@ -292,7 +300,7 @@ function New-Symlinks {
   }
 
   # Also check b4.cmd if on Windows (wrapper fallback)
-  if ($script:IsWin) {
+  if ($script:OSWin) {
     $shortCmdPath = Join-Path $InstallDir "b4.cmd"
     if (Test-Path $shortCmdPath) {
       Write-WarnMsg "Skipping short link '$shortName': 'b4.cmd' already exists in $InstallDir"
@@ -415,7 +423,7 @@ Please check:
   }
 
   # On Unix, ensure executable bit
-  if (-not $script:IsWin) {
+  if (-not $script:OSWin) {
     if (-not $DryRun) {
       try { chmod +x $binaryPath 2>$null } catch { }
     }
@@ -426,10 +434,10 @@ Please check:
   New-Symlinks -BinaryName $binaryName -InstallDir $installDir -PlatformKey $platformKey
 
   # Add to PATH
-  if ($AddToPath -and $script:IsWin) {
+  if ($AddToPath -and $script:OSWin) {
     Write-Summary ""
     Add-DirectoryToUserPath -Dir $installDir
-  } elseif ($AddToPath -and -not $script:IsWin) {
+  } elseif ($AddToPath -and -not $script:OSWin) {
     Write-Summary ""
     $shellRc = if (Test-Path "$env:HOME/.zshrc") { "$env:HOME/.zshrc" } elseif (Test-Path "$env:HOME/.bashrc") { "$env:HOME/.bashrc" } elseif (Test-Path "$env:HOME/.bash_profile") { "$env:HOME/.bash_profile" } else { "$env:HOME/.profile" }
     $pathLine = "export PATH=""$installDir`:`$PATH"""
@@ -465,7 +473,7 @@ Please check:
   Write-Summary ""
   Write-Summary "Run 'browser4-cli --help' to get started." -Color Cyan
 
-  if ($script:IsWin) {
+  if ($script:OSWin) {
     Write-Summary "If the command isn't found, restart your terminal or run:"
     Write-Summary "  `$env:Path = [System.Environment]::GetEnvironmentVariable('Path','User') + ';' + [System.Environment]::GetEnvironmentVariable('Path','Machine')"
   }

package/scripts/install-browser4-cli.sh

@@ -140,14 +140,34 @@ detect_libc() {
     return
   fi
 
-  # Check for musl
-  if ldd --version 2>&1 | grep -qi musl; then
-    echo "musl"
-  elif [[ -f /lib/ld-musl-x86_64.so.1 ]] || [[ -f /lib/ld-musl-aarch64.so.1 ]]; then
-    echo "musl"
-  else
-    echo ""
+  # Check for musl via ldd --version (guarded against missing ldd)
+  if command -v ldd >/dev/null 2>&1; then
+    if ldd --version 2>&1 | grep -qi musl; then
+      echo "musl"
+      return
+    fi
   fi
+
+  # Check for musl loader — covers common architectures
+  # x86_64, aarch64, armhf (32-bit ARM), i386, riscv64, s390x, ppc64le, mips64
+  local musl_loader
+  for musl_loader in \
+    /lib/ld-musl-x86_64.so.1 \
+    /lib/ld-musl-aarch64.so.1 \
+    /lib/ld-musl-armhf.so.1 \
+    /lib/ld-musl-i386.so.1 \
+    /lib/ld-musl-riscv64.so.1 \
+    /lib/ld-musl-s390x.so.1 \
+    /lib/ld-musl-ppc64le.so.1 \
+    /lib/ld-musl-mips64.so.1 \
+    /lib/ld-musl-mipsel.so.1; do
+    if [[ -f "$musl_loader" ]]; then
+      echo "musl"
+      return
+    fi
+  done
+
+  echo ""
 }
 
 get_platform_key() {
@@ -196,8 +216,14 @@ get_default_install_dir() {
 # ──────────────────────────────────────────────
 
 check_commands() {
-  if ! command -v curl >/dev/null 2>&1; then
-    die "'curl' is required but not found. Install curl and retry."
+  local missing=()
+  for cmd in curl mktemp stat awk grep ln mkdir chmod; do
+    if ! command -v "$cmd" >/dev/null 2>&1; then
+      missing+=("$cmd")
+    fi
+  done
+  if [[ ${#missing[@]} -gt 0 ]]; then
+    die "Required command(s) not found: ${missing[*]}. Install them and retry."
   fi
 }
 
@@ -240,10 +266,27 @@ download_file() {
     return 0
   fi
 
-  local http_code
+  local curl_stderr
+  curl_stderr=$(mktemp)
+  local http_code curl_exit
+
   http_code=$(curl -sSfL -w "%{http_code}" -o "$dest" \
     ${GITHUB_TOKEN:+-H "Authorization: Bearer $GITHUB_TOKEN"} \
-    "$url" 2>/dev/null) || true
+    "$url" 2>"$curl_stderr")
+  curl_exit=$?
+
+  if [[ $curl_exit -ne 0 ]]; then
+    local stderr_msg
+    stderr_msg=$(<"$curl_stderr")
+    rm -f "$curl_stderr" "$dest"
+    if [[ -n "$stderr_msg" ]]; then
+      warn "curl error (exit ${curl_exit}): ${stderr_msg}"
+    else
+      warn "curl failed with exit code ${curl_exit} (no stderr output)"
+    fi
+    return 1
+  fi
+  rm -f "$curl_stderr"
 
   if [[ "$http_code" == "200" ]] || [[ "$http_code" == "302" ]]; then
     local size
@@ -297,12 +340,38 @@ add_to_shell_rc() {
     return
   fi
 
+  # Ensure the file ends with a newline before appending, so the new
+  # content isn't glued to the last existing line.
+  if [[ -s "$rc_file" ]]; then
+    local last_byte
+    last_byte=$(tail -c1 "$rc_file" 2>/dev/null || true)
+    if [[ -n "$last_byte" ]]; then
+      echo "" >> "$rc_file"
+    fi
+  fi
+
+  # Use a lock file to prevent concurrent append races (best-effort).
+  local lock_file="${rc_file}.browser4-install.lock"
+  local lock_fd=9
+  # Wait up to 10 seconds for another install process to release the lock.
+  local waited=0
+  while ! (umask 0002 && command -v flock >/dev/null 2>&1 && flock -n 9 2>/dev/null); do
+    if [[ $waited -ge 10 ]]; then
+      warn "Could not acquire lock on ${rc_file} after 10s; appending anyway"
+      break
+    fi
+    sleep 0.5
+    waited=$((waited + 1))
+  done 9>"$lock_file"
+
   {
-    echo ""
     echo "# browser4-cli"
     echo "export PATH=\"$dir:\$PATH\""
   } >> "$rc_file"
 
+  # Clean up (flock auto-releases when fd 9 is closed)
+  rm -f "$lock_file" 2>/dev/null || true
+
   ok "Added to PATH in $rc_file"
   say "    Reload with: source $rc_file"
 }