relay-companion 0.1.26 → 0.1.27

package/overlay/main.cjs

@@ -884,26 +884,50 @@ function anchorTopRight() {
   return { x: wa.x + wa.width - WIN.width - MARGIN, y: wa.y + MARGIN, width: WIN.width, height: WIN.height };
 }
 
+function placeOverlayWindow() {
+  if (!win || win.isDestroyed()) return;
+  try {
+    win.setBounds(anchorTopRight(), false);
+  } catch (error) {
+    console.error("[overlay] setBounds failed:", error && error.message);
+  }
+  try {
+    win.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true });
+  } catch {}
+  try {
+    win.setAlwaysOnTop(true, "floating");
+  } catch {}
+}
+
 // Show the overlay window. Electron's forwarded-mousemove stream (the thing that
 // lets the renderer detect hover on a click-through window) can stall across a
 // hide()/show() cycle, leaving the window permanently click-through. Re-assert
 // setIgnoreMouseEvents on every hidden->shown transition and tell the renderer to
 // reset its interactivity handshake.
-function showOverlayWindow() {
-  if (!win || win.isDestroyed() || win.isVisible()) return;
+function showOverlayWindow({ force = false } = {}) {
+  if (!win || win.isDestroyed()) return;
+  const visible = win.isVisible();
+  if (visible && !force) return;
+  placeOverlayWindow();
+  if (visible && force) win.hide();
   win.showInactive();
+  if (typeof win.moveTop === "function") {
+    try {
+      win.moveTop();
+    } catch {}
+  }
   win.setIgnoreMouseEvents(true, { forward: true });
   win.webContents.send("shown");
 }
 
-function maybeShow() {
+function maybeShow({ force = false } = {}) {
   if (!win || win.isDestroyed()) return;
   // Dismissed keeps the window hidden except while a ghost notification is up.
   // trayForcedVisible honors an explicit status-area click even when no host runs.
   const dismissedEffective = trayAvailable && dismissed;
   const wanted = (hostRunning || trayForcedVisible) && (!dismissedEffective || ghostActive);
   if (wanted) {
-    showOverlayWindow();
+    showOverlayWindow({ force });
   } else if (win.isVisible()) {
     win.hide();
   }
@@ -1040,8 +1064,8 @@ function createTrayIcon() {
 function showFromTray() {
   setDismissed(false);
   ghostActive = false;
-  if (!hostRunning) trayForcedVisible = true; // an explicit click always gets the card
-  maybeShow();
+  trayForcedVisible = true; // an explicit click always gets the card
+  maybeShow({ force: true });
   if (win && !win.isDestroyed()) win.webContents.send("openFull");
 }
 

package/package.json

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

package/src/auto-update.js

@@ -172,6 +172,10 @@ export function spawnDetachedUpdate({
     `  ROOT="$(npm root -g 2>/dev/null)"`,
     `  PKG="$ROOT/${PACKAGE_NAME}"`,
     `  ELECTRON="$PKG/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron"`,
+    `  if [ ! -x "$ELECTRON" ] && [ -f "$PKG/node_modules/electron/install.js" ]; then`,
+    `    echo "[relay-update] $(date) electron runtime missing; running electron install.js" >> ${LOG} 2>&1`,
+    `    node "$PKG/node_modules/electron/install.js" >> ${LOG} 2>&1 || true`,
+    `  fi`,
     `  if [ -x "$ELECTRON" ] && [ -f "$PKG/bin/relay.js" ] && grep -q '"version"' "$PKG/package.json" 2>/dev/null; then`,
     `    echo "[relay-update] $(date) install verified; restarting services" >> ${LOG} 2>&1`,
     `    /bin/launchctl kickstart -k gui/${uid}/${PILL_LABEL} >> ${LOG} 2>&1 || true`,
@@ -179,10 +183,16 @@ export function spawnDetachedUpdate({
     `  else`,
     `    echo "[relay-update] $(date) post-install verify FAILED; restoring ${restore}" >> ${LOG} 2>&1`,
     `    npm install -g ${PACKAGE_NAME}@${restore} >> ${LOG} 2>&1 || true`,
+    `    ROOT="$(npm root -g 2>/dev/null)"`,
+    `    PKG="$ROOT/${PACKAGE_NAME}"`,
+    `    if [ -f "$PKG/node_modules/electron/install.js" ]; then node "$PKG/node_modules/electron/install.js" >> ${LOG} 2>&1 || true; fi`,
     `  fi`,
     `else`,
     `  echo "[relay-update] $(date) install FAILED; restoring ${restore}" >> ${LOG} 2>&1`,
     `  npm install -g ${PACKAGE_NAME}@${restore} >> ${LOG} 2>&1 || true`,
+    `  ROOT="$(npm root -g 2>/dev/null)"`,
+    `  PKG="$ROOT/${PACKAGE_NAME}"`,
+    `  if [ -f "$PKG/node_modules/electron/install.js" ]; then node "$PKG/node_modules/electron/install.js" >> ${LOG} 2>&1 || true; fi`,
     `fi`,
   ].join("\n");
   const child = spawnImpl("/bin/sh", ["-c", script], { detached: true, stdio: "ignore" });

package/src/install.js

@@ -240,6 +240,30 @@ function electronPathForPackageRoot(packageRoot) {
   }
 }
 
+export function ensureElectronRuntime(packageRoot, { runCommand = run } = {}) {
+  let electronPath = electronPathForPackageRoot(packageRoot);
+  if (electronPath && fs.existsSync(electronPath)) return { ok: true, electronPath, repaired: false };
+
+  const installScript = path.join(packageRoot, "node_modules", "electron", "install.js");
+  if (!fs.existsSync(installScript)) {
+    return { ok: false, reason: "electron_install_script_missing", electronPath, installScript };
+  }
+
+  const res = runCommand(process.execPath, [installScript], { timeoutMs: npmInstallTimeoutMs() });
+  electronPath = electronPathForPackageRoot(packageRoot);
+  if (res.ok && electronPath && fs.existsSync(electronPath)) {
+    return { ok: true, electronPath, repaired: true };
+  }
+
+  return {
+    ok: false,
+    reason: "electron_runtime_missing",
+    electronPath,
+    installScript,
+    detail: res.out,
+  };
+}
+
 /** Whether an agent CLI is on PATH. */
 export function commandExists(cmd) {
   const res = spawnSync(cmd, ["--version"], { encoding: "utf8", timeout: 8000 });
@@ -333,10 +357,11 @@ export function installDaemonAutostart(bin = relayBinPath(), node = process.exec
 export function installPillAutostart(bin = relayBinPath(), { platform = process.platform, runCommand = run } = {}) {
   if (platform !== "darwin" && platform !== "win32") return { ok: false, reason: "autostart_unsupported_platform" };
   const packageRoot = packageRootForBin(bin);
-  const electronPath = electronPathForPackageRoot(packageRoot);
+  const electron = ensureElectronRuntime(packageRoot, { runCommand });
+  const electronPath = electron.electronPath;
   const overlayMain = path.join(packageRoot, "overlay", "main.cjs");
-  if (!electronPath || !fs.existsSync(overlayMain)) {
-    return { ok: false, reason: "pill_runtime_missing", electronPath, overlayMain };
+  if (!electron.ok || !electronPath || !fs.existsSync(overlayMain)) {
+    return { ok: false, reason: "pill_runtime_missing", electronPath, overlayMain, electron };
   }
   if (platform === "win32") {
     const logPath = path.join(os.homedir(), ".relay", "pill.log");