@ricsam/r5d-macos-vm 0.0.78 → 0.0.80

package/bootstrap/start-worker.command.template

@@ -3,8 +3,12 @@ set -euo pipefail
 
 export PATH="/opt/homebrew/bin:$HOME/.bun/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
 STATE_DIR="$HOME/Library/Application Support/r5d"
-LOCK_DIR="$STATE_DIR/worker-terminal-__WORKER_LABEL__.lock"
-START_SCRIPT="${0:A}"
+LOCK_DIR="$STATE_DIR/worker-credential-authority.lock"
+BOOT_SESSION_ID="$(/usr/sbin/sysctl -n kern.bootsessionuuid 2>/dev/null | /usr/bin/tr '[:upper:]' '[:lower:]' || true)"
+if [[ ! "$BOOT_SESSION_ID" =~ ^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$ ]]; then
+  BOOT_SESSION_ID="unknown"
+fi
+RECOVERY_GUARD="$STATE_DIR/worker-lock-recovery-$BOOT_SESSION_ID.lock"
 
 mkdir -p "$STATE_DIR"
 chmod 700 "$STATE_DIR"
@@ -13,8 +17,8 @@ while ! mkdir "$LOCK_DIR" 2>/dev/null; do
   existing_pid="$(cat "$LOCK_DIR/pid" 2>/dev/null || true)"
   if [[ "$existing_pid" == <-> ]] && kill -0 "$existing_pid" 2>/dev/null; then
     existing_command="$(ps -ww -p "$existing_pid" -o command= 2>/dev/null || true)"
-    if [[ -n "$existing_command" && "$existing_command" == *"$START_SCRIPT"* ]]; then
-      print "r5d-worker is already running in another Terminal (PID $existing_pid)."
+    if [[ -n "$existing_command" && "$existing_command" == *"start-worker.command"* ]]; then
+      print "An r5d-worker credential authority is already running in another Terminal (PID $existing_pid)."
       read -r "?Press Return to close this window: "
       exit 0
     fi
@@ -29,12 +33,34 @@ while ! mkdir "$LOCK_DIR" 2>/dev/null; do
     continue
   fi
 
+  if ! mkdir "$RECOVERY_GUARD" 2>/dev/null; then
+    recovery_modified_at="$(stat -f %m "$RECOVERY_GUARD" 2>/dev/null || print 0)"
+    if [[ "$recovery_modified_at" == <-> ]] && (( current_epoch - recovery_modified_at >= 60 )); then
+      print "A prior worker-lock recovery was interrupted in this boot session. Reboot the VM before retrying."
+      read -r "?Press Return to close this window: "
+      exit 1
+    fi
+    sleep 1
+    continue
+  fi
+
+  # Re-read under the boot-scoped recovery guard. Without this second check,
+  # two stale-lock contenders can move a newly acquired live lock (ABA).
+  guarded_pid="$(cat "$LOCK_DIR/pid" 2>/dev/null || true)"
+  if [[ "$guarded_pid" == <-> ]] && kill -0 "$guarded_pid" 2>/dev/null; then
+    guarded_command="$(ps -ww -p "$guarded_pid" -o command= 2>/dev/null || true)"
+    if [[ -n "$guarded_command" && "$guarded_command" == *"start-worker.command"* ]]; then
+      rmdir "$RECOVERY_GUARD" 2>/dev/null || true
+      print "An r5d-worker credential authority is already running in another Terminal (PID $guarded_pid)."
+      read -r "?Press Return to close this window: "
+      exit 0
+    fi
+  fi
   stale_lock="$LOCK_DIR.stale.$$.$RANDOM"
   if mv "$LOCK_DIR" "$stale_lock" 2>/dev/null; then
     rm -rf "$stale_lock"
-  else
-    sleep 1
   fi
+  rmdir "$RECOVERY_GUARD" 2>/dev/null || true
 done
 
 print $$ > "$LOCK_DIR/pid"
@@ -66,6 +92,12 @@ wait "$worker_pid"
 worker_status=$?
 set -e
 print
-print "r5d-worker stopped with status $worker_status."
+if [[ "$worker_status" == "77" ]]; then
+  print "r5d-worker staged a credential rotation without publishing the new secret."
+  print "Shut down and restart the entire r5d macOS VM before opening this launcher again."
+  print "Closing this window, logging out, or reopening Terminal is not sufficient."
+else
+  print "r5d-worker stopped with status $worker_status."
+fi
 read -r "?Press Return to close this window: "
 exit "$worker_status"

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-macos-vm",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "type": "commonjs"
 }

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5d-macos-vm",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "type": "module"
 }

package/native-artifact.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "packageVersion": "0.0.78",
-  "url": "https://downloads.r5d.dev/r5d-macos-vm/0.0.78/R5DMacOSVM.app.zip",
-  "sha256": "0d97085d8539cb69b7b0b3b11b1cb581bc0938156885f8ad016a378f14cc0658",
-  "byteLength": 191301,
+  "packageVersion": "0.0.80",
+  "url": "https://downloads.r5d.dev/r5d-macos-vm/0.0.80/R5DMacOSVM.app.zip",
+  "sha256": "b16e6e73f3a6bb40caaf062d5911e0488fc8341e3f085e595e66113542929ff1",
+  "byteLength": 191300,
   "archiveName": "R5DMacOSVM.app.zip",
   "appName": "R5DMacOSVM.app",
   "executableName": "R5DMacOSVM",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-macos-vm",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",