From 9dc71c39cc82e1ede9a6828df15975b5dcb80a71 Mon Sep 17 00:00:00 2001
From: Omabot <david@hey.com>
Date: Sat, 22 Aug 2026 08:33:05 -0700
Subject: [PATCH] Reconcile Hermes ownership on every launch

Tidying the terminal agent's Hermes away only happened in the menu installer,
so `pacman -S hermes-desktop` on its own, or an install interrupted after the
package landed, left two Hermeses -- and by then the menu entry that would
have noticed is disabled, because we are installed.

Co-Authored-By: Codex XHigh <noreply@openai.com>
---
 pkgbuilds/hermes-desktop/PKGBUILD          | 2 +-
 pkgbuilds/hermes-desktop/hermes-desktop.sh | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgbuilds/hermes-desktop/PKGBUILD b/pkgbuilds/hermes-desktop/PKGBUILD
index 0ad83e7..2bde6be 100644
--- a/pkgbuilds/hermes-desktop/PKGBUILD
+++ b/pkgbuilds/hermes-desktop/PKGBUILD
@@ -81,7 +81,7 @@ source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz
         'hermes-desktop.desktop'
         'hermes-desktop.png')
 sha256sums=('1e3d39d3638ec15fa9d31af262568a953e9272090deb1c50c44cd401175f5b80'
-            'fc5f07c9bf77c82366ba9f631ae2c86ba657ca2a4f8712034ba03800e88fe699'
+            '6c6b59bd168d6ae34b7e9fcfcabc26ced8bccdd837bc2d09e687839ded6a9452'
             '3ef685bfcf366776b025d26c37d32854d8d4aa2023b2bd07c8e08b001ef1e8c4'
             'd60d164e24fdcf6532133b8ea43c77a201e4b9e9dbc396187b58d51d8590ef52')
 
diff --git a/pkgbuilds/hermes-desktop/hermes-desktop.sh b/pkgbuilds/hermes-desktop/hermes-desktop.sh
index bad5de5..1849f85 100644
--- a/pkgbuilds/hermes-desktop/hermes-desktop.sh
+++ b/pkgbuilds/hermes-desktop/hermes-desktop.sh
@@ -10,6 +10,14 @@ set -euo pipefail
 # arrangement upstream ships, and the only one that starts.
 export HERMES_DESKTOP_IGNORE_EXISTING=1
 
+# Reconcile every launch rather than trusting whatever installed us. A plain
+# `pacman -S hermes-desktop`, or an install interrupted partway, leaves any
+# Hermes the terminal agent had built still sitting there, and by then the
+# menu entry that would have tidied it up is disabled because we are present.
+if command -v omarchy-install-hermes-cli >/dev/null 2>&1; then
+  omarchy-install-hermes-cli >/dev/null 2>&1 || true
+fi
+
 # Chromium's own Ozone detection falls back to XWayland often enough to matter,
 # and the result is a blurry window on every scaled display. Ask for Wayland
 # directly, unless the user has already picked a platform themselves.