The cross-harness, self-improving memory layer for AI agents. Join our community: https://discord.com/invite/zdNChS2fBu
Go agent-ai-cliagent-harnessesagent-securitybrowser-extensionciclaude-codecloudcodexcursordetection-engineeringjevknowledge-basememorymobile-device-managementobservabilitysecuritysecurity-information-and-event-managementsecurity-toolstelemetrytraces
fix(endpoint): defer updater reload after self-update
shukieshahef25e3cfa06e
diff --git a/cli/beacon/internal/endpoint/service/updater.go b/cli/beacon/internal/endpoint/service/updater.goindex 5cc1ddeb..8944cebf 100644--- a/cli/beacon/internal/endpoint/service/updater.go+++ b/cli/beacon/internal/endpoint/service/updater.go@@ -3,6 +3,7 @@ package serviceimport ("fmt""os"+ "os/exec""path/filepath""runtime""strings"@@ -15,6 +16,17 @@ const UpdaterLabel = "com.beacon.endpoint.updater"// service it is system-only and runs on a schedule rather than KeepAlive.type UpdaterManager struct{}+var startDeferredUpdaterReload = func(path string) error {+ cmd := exec.Command("/bin/sh", "-c", fmt.Sprintf(+ "sleep 75; /bin/launchctl bootout system/%s >/dev/null 2>&1 || true; /bin/launchctl bootstrap system %s >/dev/null 2>&1",+ UpdaterLabel,+ shellQuote(path),+ ))+ cmd.Stdout = nil+ cmd.Stderr = nil+ return cmd.Start()+}+// PlistPath returns the LaunchDaemon plist path for the updater job.func (UpdaterManager) PlistPath() string {return filepath.Join("/Library/LaunchDaemons", UpdaterLabel+".plist")@@ -37,10 +49,10 @@ func (m UpdaterManager) Load() error {if runtime.GOOS != "darwin" {return nil}+ path := m.PlistPath()if status := m.Status(); status.Loaded && status.Running {- return nil+ return startDeferredUpdaterReload(path)}- path := m.PlistPath()return loadLaunchdJob("system", UpdaterLabel, path)}@@ -103,3 +115,7 @@ func updaterPlist(label, program string) string {</plist>`, label, program, label, label)}++func shellQuote(s string) string {+ return "'" + strings.ReplaceAll(s, "'", "'\\''") + "'"+}diff --git a/cli/beacon/internal/endpoint/service/updater_test.go b/cli/beacon/internal/endpoint/service/updater_test.goindex f19c313c..2fcb413d 100644--- a/cli/beacon/internal/endpoint/service/updater_test.go+++ b/cli/beacon/internal/endpoint/service/updater_test.go@@ -50,12 +50,13 @@ func TestUpdaterWritePlistNonDarwinContract(t *testing.T) {}}-func TestUpdaterLoadDoesNotUnloadRunningUpdater(t *testing.T) {+func TestUpdaterLoadDefersReloadForRunningUpdater(t *testing.T) {if runtime.GOOS != "darwin" {t.Skip("launchd updater load is macOS-only")}var calls []stringoldRun := runLaunchctlCommand+ oldDeferred := startDeferredUpdaterReloadrunLaunchctlCommand = func(args ...string) (string, error) {calls = append(calls, strings.Join(args, " "))if strings.Join(args, " ") == "print system/"+UpdaterLabel {@@ -63,8 +64,14 @@ func TestUpdaterLoadDoesNotUnloadRunningUpdater(t *testing.T) {}return "", errors.New("unexpected launchctl call")}+ var deferredPath string+ startDeferredUpdaterReload = func(path string) error {+ deferredPath = path+ return nil+ }t.Cleanup(func() {runLaunchctlCommand = oldRun+ startDeferredUpdaterReload = oldDeferred})if err := (UpdaterManager{}).Load(); err != nil {@@ -73,4 +80,7 @@ func TestUpdaterLoadDoesNotUnloadRunningUpdater(t *testing.T) {if len(calls) != 1 || calls[0] != "print system/"+UpdaterLabel {t.Fatalf("launchctl calls = %#v, want only status print", calls)}+ if deferredPath != (UpdaterManager{}).PlistPath() {+ t.Fatalf("deferred reload path = %q, want updater plist", deferredPath)+ }}