relay-companion 0.1.37 → 0.1.38

package/overlay/main.cjs

@@ -1066,6 +1066,7 @@ function maybeShow({ force = false, reposition = true } = {}) {
   } else if (win.isVisible()) {
     win.hide();
   }
+  syncTray(); // keep the tray tooltip in step with the pill's actual visibility
 }
 
 function refreshOverlayForActiveSpace({ force = false } = {}) {
@@ -1265,6 +1266,45 @@ function showFromTray() {
   trayForcedVisible = true; // an explicit click always gets the card
   maybeShow({ force: true });
   if (win && !win.isDestroyed()) win.webContents.send("openFull");
+  syncTray();
+}
+
+// Whether the pill card is actually on screen right now.
+function pillIsOnScreen() {
+  return Boolean(win && !win.isDestroyed() && win.isVisible() && !dismissed);
+}
+
+// Tray-driven hide: the counterpart to showFromTray, so the menu-bar icon TOGGLES.
+// Persists the dismissal (like the card's ✕) so it stays hidden until the icon is
+// clicked again — reachable because the tray exists whenever this runs.
+function hideFromTray() {
+  setDismissed(true);
+  ghostActive = false;
+  trayForcedVisible = false;
+  if (win && !win.isDestroyed() && win.isVisible()) win.hide();
+  syncTray();
+}
+
+let lastTrayToggleAt = 0;
+function toggleFromTray() {
+  const now = Date.now();
+  if (now - lastTrayToggleAt < 300) return; // collapse a double-click into one toggle
+  lastTrayToggleAt = now;
+  if (pillIsOnScreen()) hideFromTray();
+  else showFromTray();
+}
+
+// Keep the tooltip honest about what a click will do, so the menu bar never offers
+// to "Show Relay" while it is already open.
+let trayShownState = null;
+function syncTray() {
+  if (!tray) return;
+  const showing = pillIsOnScreen();
+  if (showing === trayShownState) return;
+  trayShownState = showing;
+  try {
+    tray.setToolTip(showing ? "Relay — click to hide" : "Relay — click to show");
+  } catch {}
 }
 
 function createTray() {
@@ -1277,14 +1317,22 @@ function createTray() {
   }
   tray = new Tray(icon);
   trayAvailable = true;
-  tray.setToolTip(`Relay - click to show the pill`);
-  tray.setContextMenu(
-    Menu.buildFromTemplate([
-      { label: "Show Relay", click: showFromTray },
-    ]),
-  );
-  tray.on("click", showFromTray);
-  tray.on("double-click", showFromTray);
+  trayShownState = null;
+  syncTray();
+  // NO static context menu: on macOS setting one makes a left-click open the menu
+  // instead of firing 'click', which is what forced the redundant "Show Relay" item
+  // even when the pill was already open. Left-click now TOGGLES directly; right-click
+  // still offers a state-aware menu ("Hide Relay" when open) for discoverability.
+  tray.on("click", toggleFromTray);
+  tray.on("right-click", () => {
+    try {
+      tray.popUpContextMenu(
+        Menu.buildFromTemplate([{ label: pillIsOnScreen() ? "Hide Relay" : "Show Relay", click: toggleFromTray }]),
+      );
+    } catch (error) {
+      console.error("[overlay] tray menu failed:", error && error.message);
+    }
+  });
 }
 
 // ---- ipc -----------------------------------------------------------------
@@ -1417,6 +1465,8 @@ if (!gotSingleInstanceLock) {
     if (process.env.RELAY_OVERLAY_TEST === "1") {
       global.__relayTest = {
         showFromTray,
+        toggleFromTray,
+        pillIsOnScreen,
         maybeShow,
         refreshOverlayForActiveSpace,
         pollHosts,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-companion",
-  "version": "0.1.37",
+  "version": "0.1.38",
   "description": "Relay companion: connects local coding agents to Relay tasks, approvals, and connector tools.",
   "type": "module",
   "bin": {