[allenhouchins]

Checklist for submitter

• Input data is properly validated, SELECT * is avoided, SQL injection is prevented (using placeholders for values in statements), JS inline code is prevented especially for url redirects, and untrusted data interpolated into shell scripts/commands is validated against shell metacharacters.
• Timeouts are implemented and retries are limited to avoid infinite loops

Testing

• QA'd all new/changed functionality manually

go test ./ee/maintained-apps/... ./cmd/maintained-apps/... passes.

I ran the script in bash with osascript, pkill, installer and open stubbed, in four modes:

Mode	Result
Not running	Installs, no relaunch
Quits on SIGTERM	Quits, installs, relaunches
Ignores SIGTERM	"did not quit", exit 1, nothing installed
Installer fails	Exits with the installer's code, no relaunch

On a real Mac (1Password 8.12.42), I ran the script as the logged-in user with only installer stubbed. It quit the running 1Password with SIGTERM, then relaunched it. I haven't run a real root install on a host. The FMA validator on this PR runs the install.

AI

AI: Claude Code (claude-opus-5-5)

Summary

In dogfood, the 1Password install fails on almost every attempt:

Quitting application 'com.1password.1password'...
Application 'com.1password.1password' did not quit.

1Password's Electron main process cancels before-quit when Keep 1Password in the menu bar (keepInTray) is on, which is the default. It closes its windows and stays in the menu bar. So tell application id "com.1password.1password" to quit never stops it. The script retried for 10 seconds, then exited 1. That's been the case since #55342 made custom install scripts stop when the app won't quit. Before that, the pgrep check was a no-op and the pkg installed over the running app.

1Password handles SIGTERM (and SIGINT, power-off, and its menu bar Quit item) by setting a "really quit" flag, then quitting through its normal will-quit shutdown. On a real Mac, pkill -TERM -x 1Password closed it, and every process in the bundle, in under a second.

Changes:

• 1password_install.sh:
  • A new quit_and_track_1password sends SIGTERM, then polls is running the same way the shared helper does. It returns 1 after 10 seconds, so the install still stops if 1Password won't exit.
  • It now relaunches 1Password after the install with a verbatim copy of relaunch_application. Before, a 1Password that quit stayed closed.
  • installer gets || exit $?, matching the generated pkg scripts.
• outputs/1password/darwin.json: new install_script_ref and its ref only. No version bump, and the uninstall is unchanged.

Related PRs:

• Check every quit_* call in custom FMA install scripts #56454 widens TestCustomInstallScriptsStopWhenAppWontQuit to every quit_* call, so it also checks quit_and_track_1password. The two PRs can merge in either order.
• Quit 1Password with SIGTERM in the macOS FMA uninstall #56453 fixes the 1Password uninstall the same way, before Stop macOS FMA uninstalls when the app won't quit #56314 makes its quit fatal. Both PRs change the refs in outputs/1password/darwin.json, so whichever merges second needs its output regenerated.

Summary by CodeRabbit

• Bug Fixes
  • The 1Password installer now restores the app after installation if it was running beforehand.
  • Installation reports a failure if 1Password cannot quit or the installer does not complete successfully.

[github-actions]

Script Diff Results

ee/maintained-apps/outputs/1password/darwin.json

=== Install // 070d64dd -> c0388cc8 ===

--- /tmp/old.FyosSu	2026-10-23 17:29:48.936724892 +0000
+++ /tmp/new.NkPJES	2026-10-23 17:29:48.936724892 +0000
@@ -1,30 +1,40 @@
 #!/bin/bash
 
-quit_application() {
-  local bundle_id="$1"
+# With "Keep 1Password in the menu bar" on (the default), 1Password answers a
+# quit event by closing its windows and staying in the menu bar. SIGTERM quits
+# it fully, the same as Quit in its menu bar menu.
+quit_and_track_1password() {
+  local bundle_id="com.1password.1password"
+  local var_name="APP_WAS_RUNNING_${bundle_id//[^[:alnum:]_]/_}"
   local timeout_duration=10
 
   # check if the application is running
   local app_running
   app_running=$(osascript -e "application id \"$bundle_id\" is running" 2>/dev/null)
   if [[ "$app_running" != "true" ]]; then
+    eval "export $var_name=0"
     return
   fi
 
   local console_user
   console_user=$(stat -f "%Su" /dev/console)
-  if [[ $EUID -eq 0 && "$console_user" == "root" ]]; then
+  if [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; then
     echo "Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'."
+    eval "export $var_name=0"
     return
   fi
 
+  # App was running, mark it for relaunch
+  eval "export $var_name=1"
+  echo "Application '$bundle_id' was running; will relaunch after installation."
+
   echo "Quitting application '$bundle_id'..."
+  pkill -TERM -x 1Password
 
-  # try to quit the application within the timeout period
+  # wait for the application to quit within the timeout period
   local quit_success=false still_running
   SECONDS=0
   while (( SECONDS < timeout_duration )); do
-    osascript -e "tell application id \"$bundle_id\" to quit" >/dev/null 2>&1
     sleep 1
     if still_running=$(osascript -e "application id \"$bundle_id\" is running" 2>/dev/null) && [[ "$still_running" == "false" ]]; then
       echo "Application '$bundle_id' quit successfully."
@@ -39,5 +49,47 @@
   fi
 }
 
-quit_application 'com.1password.1password' || exit 1
-installer -pkg "$INSTALLER_PATH" -target /
+relaunch_application() {
+  local bundle_id="$1"
+  local var_name="APP_WAS_RUNNING_${bundle_id//[^[:alnum:]_]/_}"
+  local was_running
+
+  # Check if the app was running before installation
+  eval "was_running=\$$var_name"
+  if [[ "$was_running" != "1" ]]; then
+    return
+  fi
+
+  local console_user
+  console_user=$(stat -f "%Su" /dev/console)
+  if [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; then
+    echo "Not logged into a non-root GUI; skipping relaunching application ID '$bundle_id'."
+    return
+  fi
+
+  echo "Relaunching application '$bundle_id'..."
+
+  # Launch the app in the logged-in user's GUI session. Apps launched by root
+  # won't register with the user's Dock/GUI, so run 'open' as the console user.
+  # Use 'launchctl asuser' to bootstrap into the console user's Mach namespace
+  # and GUI session — 'sudo -u' alone doesn't do this, which can cause
+  # LSOpenURLsWithRole() failures even when 'open' exits 0.
+  local open_status=0
+  if [[ $EUID -eq 0 ]]; then
+    local console_uid
+    console_uid=$(id -u "$console_user")
+    /bin/launchctl asuser "$console_uid" sudo -u "$console_user" open -b "$bundle_id" >/dev/null 2>&1 || open_status=$?
+  else
+    open -b "$bundle_id" >/dev/null 2>&1 || open_status=$?
+  fi
+
+  if [[ $open_status -eq 0 ]]; then
+    echo "Application '$bundle_id' relaunched successfully."
+  else
+    echo "Failed to relaunch application '$bundle_id'."
+  fi
+}
+
+quit_and_track_1password || exit 1
+installer -pkg "$INSTALLER_PATH" -target / || exit $?
+relaunch_application 'com.1password.1password'

=== Uninstall Script (no changes) ===

[github-actions]

Script Diff Results

ee/maintained-apps/outputs/1password/darwin.json

=== Install // 070d64dd -> c0388cc8 ===

--- /tmp/old.ul3eS0	2026-10-23 17:35:07.179274014 +0000
+++ /tmp/new.2oxxIz	2026-10-23 17:35:07.180274023 +0000
@@ -1,30 +1,40 @@
 #!/bin/bash
 
-quit_application() {
-  local bundle_id="$1"
+# With "Keep 1Password in the menu bar" on (the default), 1Password answers a
+# quit event by closing its windows and staying in the menu bar. SIGTERM quits
+# it fully, the same as Quit in its menu bar menu.
+quit_and_track_1password() {
+  local bundle_id="com.1password.1password"
+  local var_name="APP_WAS_RUNNING_${bundle_id//[^[:alnum:]_]/_}"
   local timeout_duration=10
 
   # check if the application is running
   local app_running
   app_running=$(osascript -e "application id \"$bundle_id\" is running" 2>/dev/null)
   if [[ "$app_running" != "true" ]]; then
+    eval "export $var_name=0"
     return
   fi
 
   local console_user
   console_user=$(stat -f "%Su" /dev/console)
-  if [[ $EUID -eq 0 && "$console_user" == "root" ]]; then
+  if [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; then
     echo "Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'."
+    eval "export $var_name=0"
     return
   fi
 
+  # App was running, mark it for relaunch
+  eval "export $var_name=1"
+  echo "Application '$bundle_id' was running; will relaunch after installation."
+
   echo "Quitting application '$bundle_id'..."
+  pkill -TERM -x 1Password
 
-  # try to quit the application within the timeout period
+  # wait for the application to quit within the timeout period
   local quit_success=false still_running
   SECONDS=0
   while (( SECONDS < timeout_duration )); do
-    osascript -e "tell application id \"$bundle_id\" to quit" >/dev/null 2>&1
     sleep 1
     if still_running=$(osascript -e "application id \"$bundle_id\" is running" 2>/dev/null) && [[ "$still_running" == "false" ]]; then
       echo "Application '$bundle_id' quit successfully."
@@ -39,5 +49,47 @@
   fi
 }
 
-quit_application 'com.1password.1password' || exit 1
-installer -pkg "$INSTALLER_PATH" -target /
+relaunch_application() {
+  local bundle_id="$1"
+  local var_name="APP_WAS_RUNNING_${bundle_id//[^[:alnum:]_]/_}"
+  local was_running
+
+  # Check if the app was running before installation
+  eval "was_running=\$$var_name"
+  if [[ "$was_running" != "1" ]]; then
+    return
+  fi
+
+  local console_user
+  console_user=$(stat -f "%Su" /dev/console)
+  if [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; then
+    echo "Not logged into a non-root GUI; skipping relaunching application ID '$bundle_id'."
+    return
+  fi
+
+  echo "Relaunching application '$bundle_id'..."
+
+  # Launch the app in the logged-in user's GUI session. Apps launched by root
+  # won't register with the user's Dock/GUI, so run 'open' as the console user.
+  # Use 'launchctl asuser' to bootstrap into the console user's Mach namespace
+  # and GUI session — 'sudo -u' alone doesn't do this, which can cause
+  # LSOpenURLsWithRole() failures even when 'open' exits 0.
+  local open_status=0
+  if [[ $EUID -eq 0 ]]; then
+    local console_uid
+    console_uid=$(id -u "$console_user")
+    /bin/launchctl asuser "$console_uid" sudo -u "$console_user" open -b "$bundle_id" >/dev/null 2>&1 || open_status=$?
+  else
+    open -b "$bundle_id" >/dev/null 2>&1 || open_status=$?
+  fi
+
+  if [[ $open_status -eq 0 ]]; then
+    echo "Application '$bundle_id' relaunched successfully."
+  else
+    echo "Failed to relaunch application '$bundle_id'."
+  fi
+}
+
+quit_and_track_1password || exit 1
+installer -pkg "$INSTALLER_PATH" -target / || exit $?
+relaunch_application 'com.1password.1password'

=== Uninstall Script (no changes) ===

[Copilot]

🟡 Changes recommended

The described regression-test update is missing, leaving the renamed quit helper outside the existing failure-guard check.

1 open issue

• Update test matcher for renamed quit helper · New

What changed in this PR

This PR fixes Fleet’s macOS 1Password maintained-app installation when the default menu-bar setting prevents AppleScript from fully quitting the app.

Changes:

• Sends SIGTERM and waits up to 10 seconds for 1Password to exit before installing.
• Relaunches a previously running app after successful installation and preserves installer failures.
• Refreshes the generated install script and reference without changing the version or uninstall script.

File	Description
ee/​maintained-apps/​outputs/​1password/​darwin.json	Updates the embedded install script and its reference.
ee/​maintained-apps/​inputs/​homebrew/​scripts/​1password_install.sh	Adds SIGTERM shutdown, conditional relaunch, and installer error handling.

_{Review effort: Balanced}