relay-companion 0.1.39 → 0.1.41

package/bin/relay.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import os from "node:os";
 import path from "node:path";
+import { randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 import { spawnSync, spawn } from "node:child_process";
@@ -10,8 +11,9 @@ import { RelayClient } from "../src/client.js";
 import { writeConfig, readConfig, apiUrl, DEFAULT_API_URL, DEFAULT_WEB_URL } from "../src/config.js";
 import { runTaskDaemon, pollTaskRuntimeOnce } from "../src/task-daemon.js";
 import { runMcpServer } from "../src/mcp.js";
-import { runSetupInstall, runUninstall } from "../src/install.js";
+import { repairDesktopSurfaces, runSetupInstall, runUninstall } from "../src/install.js";
 import { runUpdateOnce } from "../src/auto-update.js";
+import { pillStatusPath, waitForPillReady } from "../src/pill-control.js";
 import { liveToolRequirement, requiredLiveHosts, shouldRequireLiveTools } from "../src/setup-activation.js";
 import { openRelay, openTask } from "../src/materializer.js";
 import { resetCompanionStateForAccount } from "../src/notifications.js";
@@ -35,6 +37,16 @@ function parseFlags(argv) {
   return { flags, positional };
 }
 
+function companionVersion() {
+  try {
+    const require = createRequire(import.meta.url);
+    const pkg = require("../package.json");
+    return typeof pkg.version === "string" ? pkg.version : "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
 async function prompt(question, fallback = "") {
   const rl = readline.createInterface({ input: stdin, output: stdout });
   const answer = (await rl.question(question)).trim();
@@ -97,7 +109,7 @@ function printActivationStatus(activation) {
 }
 
 function statusAreaReopenText() {
-  if (process.platform === "darwin") return "the Relay icon in the menu bar";
+  if (process.platform === "darwin") return "the Relay app in Spotlight or the Relay icon in the menu bar";
   if (process.platform === "win32") return "the Relay icon in the system tray near the clock";
   return "the Relay icon in the system tray";
 }
@@ -180,6 +192,22 @@ async function cmdInstall() {
   await applyInstall({ requireLiveTools: shouldRequireLiveTools(), requiredHosts: requiredLiveHosts() });
 }
 
+function cmdRepairDesktop(flags = {}) {
+  const reload = !flags["no-restart"];
+  const repaired = repairDesktopSurfaces({ reload });
+  if (!repaired.ok) {
+    const failures = [
+      !repaired.daemon?.ok && `daemon: ${repaired.daemon?.reason || "install failed"}`,
+      !repaired.pill?.ok && `pill: ${repaired.pill?.reason || "install failed"}`,
+    ].filter(Boolean);
+    throw new Error(`Could not repair Relay desktop services (${failures.join(", ")}).`);
+  }
+  const appText = repaired.pill?.appPath ? ` Relay.app is installed at ${repaired.pill.appPath}.` : "";
+  const restartText = reload ? "Relay background services were reloaded." : "Relay background service files were refreshed without restarting them.";
+  console.log(`${restartText}${appText}`);
+  return repaired;
+}
+
 /** Remove the Relay tools from both agents and stop the background daemon. */
 async function cmdUninstall() {
   runUninstall();
@@ -274,8 +302,8 @@ async function cmdAnswerQuestion(flags) {
   console.log("Sent answer to Relay. The waiting task agent will resume on the next daemon poll.");
 }
 
-/** Launch the desktop Relay companion pill (Electron overlay). */
-function cmdPill() {
+/** Launch (or signal) the desktop Relay companion pill and verify it is visible. */
+async function cmdPill() {
   const here = path.dirname(fileURLToPath(import.meta.url));
   const overlayMain = path.resolve(here, "../overlay/main.cjs");
   // require("electron") returns the path to the electron binary when resolved under node.
@@ -293,25 +321,44 @@ function cmdPill() {
   if (typeof electronPath !== "string") {
     throw new Error("Could not resolve the Electron binary. Run `npm install` in packages/companion.");
   }
-  const child = spawn(electronPath, [overlayMain], {
+  const reopenNonce = `cli-${process.pid}-${randomUUID()}`;
+  let spawnError = null;
+  const child = spawn(electronPath, [overlayMain, "--relay-reopen", reopenNonce], {
     detached: true,
     stdio: "ignore",
     env: { ...process.env },
   });
+  child.on("error", (error) => {
+    spawnError = error;
+  });
   child.unref();
-  console.log(`Relay pill launched. It shows when Claude Code or Codex is running; reopen it from ${statusAreaReopenText()} after hiding it.`);
+  const result = await waitForPillReady(reopenNonce);
+  if (!result.ok) {
+    const detail = spawnError ? ` ${spawnError.message || spawnError}` : "";
+    throw new Error(
+      `Relay was started but did not confirm that its pill became visible.${detail} Check ${pillStatusPath()} and ~/.relay/pill.log.`,
+    );
+  }
+  console.log(`Relay pill is visible. Reopen it from ${statusAreaReopenText()} after hiding it.`);
 }
 
 async function main() {
   const [command, ...rest] = process.argv.slice(2);
   const { flags, positional } = parseFlags(rest);
   switch (command) {
+    case "version":
+    case "--version":
+    case "-v":
+      console.log(companionVersion());
+      return;
     case "setup":
       return cmdSetup(flags);
     case "pair":
       return cmdPair(flags);
     case "install":
       return cmdInstall();
+    case "repair-desktop":
+      return cmdRepairDesktop(flags);
     case "uninstall":
       return cmdUninstall();
     case "whoami":
@@ -341,10 +388,12 @@ async function main() {
           "",
           "Usage:",
           "  relay setup [--code CODE] [--name NAME]               Pair this machine and add Relay to Claude Code + Codex",
+          "  relay version                                         Print the installed Relay companion version",
           "  relay setup --code CODE --open-relay TOKEN --host codex|claude",
           "  relay setup --interactive                             Prompt for API URL and device name during setup",
           "  relay install                                         Add Relay to your agents (device already paired)",
           "  relay uninstall                                       Remove Relay from your agents and stop the daemon",
+          "  relay repair-desktop [--no-restart]                  Repair Relay.app and background services without changing MCP/account state",
           "  relay pair [--api URL] [--web URL] [--code CODE]      Pair this machine only (no agent install)",
           "  relay tasks                                           Pull and process task agent runtime once",
           "  relay open <id> --host claude|codex                  Materialize a staged Relay row into a native agent session",

package/overlay/host-select.cjs

@@ -11,12 +11,22 @@
 // desktop it breaks"). The running-process signal (from `ps`, which is Space-agnostic)
 // is the reliable tiebreaker, so it now sits ahead of the installed-preference default.
 
+const CLAUDE_DESKTOP_BUNDLE = "com.anthropic.claudefordesktop";
+const CODEX_DESKTOP_BUNDLES = ["com.openai.codex", "com.openai.chat"];
+
 function hostFromBundle(bundle) {
-  if (bundle === "com.anthropic.claudefordesktop") return "claude";
-  if (bundle === "com.openai.codex") return "codex";
+  if (bundle === CLAUDE_DESKTOP_BUNDLE) return "claude";
+  if (CODEX_DESKTOP_BUNDLES.includes(bundle)) return "codex";
   return null;
 }
 
+function activationBundleCandidates(host, observedBundle = null) {
+  if (host === "claude") return [CLAUDE_DESKTOP_BUNDLE];
+  if (host !== "codex") return [];
+  const observed = CODEX_DESKTOP_BUNDLES.includes(observedBundle) ? observedBundle : null;
+  return [...new Set([observed, ...CODEX_DESKTOP_BUNDLES].filter(Boolean))];
+}
+
 function isRelayBundle(bundle) {
   const clean = String(bundle || "").toLowerCase();
   return clean.includes("relay") || clean.includes("electron");
@@ -103,4 +113,31 @@ function runningHostsFromProcessList(text, platform = process.platform) {
   };
 }
 
-module.exports = { hostFromBundle, isRelayBundle, defaultClickHost, chooseClickHost, runningHostsFromProcessList };
+// Terminal Claude Code is useful diagnostic state, but it is not a desktop surface
+// Relay can foreground: Relay's Claude materializer opens a claude:// resume link in
+// Claude Desktop. Keep this separate from runningHostsFromProcessList so a terminal-
+// only process never diverts a click away from a usable Codex/ChatGPT desktop window.
+function terminalClaudeCodeRunningFromProcessList(text, platform = process.platform) {
+  const lines = String(text || "").split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  if (platform === "darwin") {
+    return lines.some(
+      (line) =>
+        !/\.app\/Contents\//i.test(line) &&
+        /(?:^|\/)claude(?:-code)?(?:\.exe)?$/i.test(line),
+    );
+  }
+  if (platform === "win32") {
+    return lines.some((line) => /(?:^|[\\/\"])(?:claude-code|claude)(?:\.exe)?(?:\"|$)/i.test(line));
+  }
+  return lines.some((line) => /(?:^|\/)claude(?:-code)?$/i.test(line));
+}
+
+module.exports = {
+  hostFromBundle,
+  activationBundleCandidates,
+  isRelayBundle,
+  defaultClickHost,
+  chooseClickHost,
+  runningHostsFromProcessList,
+  terminalClaudeCodeRunningFromProcessList,
+};

package/overlay/inbox.html

@@ -100,7 +100,7 @@
   }
   .count {
     font-family:var(--mono); font-size:13px; font-weight:500; font-variant-numeric:tabular-nums;
-    color:var(--accent); line-height:1; transition:color .3s var(--settle);
+    color:var(--accent); line-height:1; white-space:nowrap; transition:color .3s var(--settle);
   }
   .count.zero { color:var(--muted-3); }
   /* ✕ — fully hide the overlay; the Relay mark in the OS status area brings it back.
@@ -651,7 +651,7 @@
 
   const REDUCED = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
   const EXPANDED = { w: 344, h: 524 };
-  const PILL = { w: 178, h: 44 }; // wide enough for mark + word + count + ✕
+  const PILL = { w: 244, h: 44 }; // wide enough for mark + word + "N unopened" + ✕
   const PEEK = { w: 344, h: 118 };
 
   // ---------- zero-latency sound (Web Audio, pre-decoded) ----------
@@ -720,16 +720,19 @@
   // ---------- collapse / expand / peek ----------
   let collapsed = false;
   let peeking = false, peekTimer = null;
+  let notificationDurationMs = 7000;
+  let activeNotificationIds = [];
   let ghost = false, ghostTimer = null; // notification-only mode while the pill is dismissed
   function clearPeek() {
     if (peekTimer) { clearTimeout(peekTimer); peekTimer = null; }
     peeking = false;
-    cardEl.classList.remove("peek");
+    cardEl.classList.remove("peek", "notifying");
   }
   function setCollapsed(v) {
     clearPeek();
     if (v === collapsed) return;
     collapsed = v;
+    refreshCountLabel();
     cardEl.classList.toggle("collapsed", collapsed);
     springTo(collapsed ? PILL.w : EXPANDED.w, collapsed ? PILL.h : EXPANDED.h);
     playTink();
@@ -747,6 +750,7 @@
     if (ghostTimer) { clearTimeout(ghostTimer); ghostTimer = null; }
     clearPeek();
     collapsed = false;
+    refreshCountLabel();
     cardEl.classList.add("offstage");
     cardEl.classList.remove("collapsed", "ghost", "bye");
     snapSize(EXPANDED.w, EXPANDED.h);
@@ -767,6 +771,10 @@
     if (ghostTimer) { clearTimeout(ghostTimer); ghostTimer = null; }
     if (peekTimer) { clearTimeout(peekTimer); peekTimer = null; }
     const wasGhost = ghost;
+    if (!wasGhost && activeNotificationIds.length && window.relay.attentionDone) {
+      window.relay.attentionDone(activeNotificationIds);
+      activeNotificationIds = [];
+    }
     cardEl.classList.add("bye");
     setInteractive(false);
     byeTimer = setTimeout(() => {
@@ -784,6 +792,7 @@
     cancelBye(); // a banner arriving mid-exit must not be torn down by the old exit
     clearPeek();
     collapsed = false;
+    refreshCountLabel();
     cardEl.classList.remove("collapsed", "offstage", "bye");
     ghost = true; peeking = true;
     cardEl.classList.add("peek", "ghost");
@@ -801,11 +810,13 @@
       ghostTimer = null;
       if (interactive || quickReplyIsActive()) { ghostTimer = setTimeout(tick, 4000); return; }
       dismissOverlay(); // rides the ghostOut exit, then main re-hides the window
-    }, 7000);
+    }, notificationDurationMs);
   }
   // Status-area Relay mark clicked: the card comes back FULLY OPEN (never the pill).
   function trayOpen() {
     const wasOffstage = cardEl.classList.contains("offstage") || cardEl.classList.contains("bye");
+    const completedNotificationIds = activeNotificationIds;
+    activeNotificationIds = [];
     cancelBye(); // a reopen mid-exit must survive: the pending dismiss would hide us again
     if (ghostTimer) { clearTimeout(ghostTimer); ghostTimer = null; }
     ghost = false;
@@ -825,30 +836,38 @@
       springTo(EXPANDED.w, EXPANDED.h);
     }
     renderAll();
+    if (completedNotificationIds.length && window.relay.attentionDone) window.relay.attentionDone(completedNotificationIds);
     playTink();
   }
   // The banner must show its WHOLE first row — a clipped preview reads as broken.
   // Measure after render; QR question rows are tall, so allow room before capping.
   function peekHeight() {
-    const first = scrollEl.querySelector(".row, .task");
-    const rowH = first ? first.offsetHeight : 74;
-    return Math.min(44 + rowH + 6, 340);
-  }
-  // A new relay arrived. If folded, peek open like an iOS banner (~7s) then fold back.
-  // The peek routes to Relays. Task/share rows are hidden until that product surface is ready.
-  function notifyArrival(row) {
-    if (!collapsed && !peeking) return;
+    const stack = [...relaysListEl.querySelectorAll(".row")];
+    const rowsHeight = stack.reduce((sum, row) => sum + row.offsetHeight, 0);
+    return Math.min(44 + rowsHeight + 6, EXPANDED.h);
+  }
+  // New relays always enter the notification stack, including from a fully expanded
+  // card. The main process has already pushed the new payload, so render/sizing uses
+  // the latest unopened rows rather than the previous inbox.
+  function notifyArrival(rows) {
     if (peekTimer) clearTimeout(peekTimer);
+    cancelBye();
+    if (ghostTimer) { clearTimeout(ghostTimer); ghostTimer = null; }
+    ghost = false;
     peeking = true;
     collapsed = false;
-    cardEl.classList.remove("collapsed");
-    cardEl.classList.add("peek");
+    refreshCountLabel();
+    activeNotificationIds = (Array.isArray(rows) ? rows : [rows]).filter(Boolean).map((row) => row.id).filter(Boolean);
+    cardEl.classList.remove("collapsed", "peek", "offstage", "ghost", "bye");
+    // Keep the exact production expanded UI (tabs, typography, separators). This
+    // class is state-only for tests; it intentionally has no visual CSS of its own.
+    cardEl.classList.add("notifying");
     activeView = "relays";
     syncTabs();
     applyView();
     renderAll();
     scrollEl.scrollTop = 0;
-    springTo(PEEK.w, peekHeight());
+    springTo(EXPANDED.w, EXPANDED.h);
     playTink();
     peekTimer = setTimeout(function tick() {
       peekTimer = null;
@@ -858,10 +877,14 @@
       // hold while hovered too). Mirrors the ghost-notification guard.
       if (interactive || quickReplyIsActive()) { peekTimer = setTimeout(tick, 4000); return; }
       peeking = false;
-      cardEl.classList.remove("peek");
+      cardEl.classList.remove("peek", "notifying");
       collapsed = true; cardEl.classList.add("collapsed");
+      refreshCountLabel();
       springTo(PILL.w, PILL.h);
-    }, 7000);
+      renderAll(); // restore the normal full list behind the now-folded pill
+      if (activeNotificationIds.length && window.relay.attentionDone) window.relay.attentionDone(activeNotificationIds);
+      activeNotificationIds = [];
+    }, notificationDurationMs);
   }
   function openFull() {
     if (ghost) {
@@ -872,10 +895,15 @@
       if (ghostTimer) { clearTimeout(ghostTimer); ghostTimer = null; }
       window.relay.undismiss();
     }
+    const completedNotificationIds = activeNotificationIds;
+    activeNotificationIds = [];
     clearPeek();
     collapsed = false;
+    refreshCountLabel();
     cardEl.classList.remove("collapsed");
     springTo(EXPANDED.w, EXPANDED.h);
+    renderAll();
+    if (completedNotificationIds.length && window.relay.attentionDone) window.relay.attentionDone(completedNotificationIds);
     playTink();
   }
 
@@ -1159,13 +1187,19 @@
     else window.relay.open(id);
   }
 
+  let unreadCount = 0;
+  function refreshCountLabel() {
+    const label = collapsed ? `${unreadCount} unopened` : String(unreadCount);
+    if (countEl.textContent !== label) {
+      countEl.textContent = label;
+      if (!REDUCED) { countEl.style.animation = "none"; void countEl.offsetWidth; countEl.style.animation = "countRoll .2s var(--settle)"; }
+    }
+  }
   function setCount(n) {
+    unreadCount = n;
     cardEl.classList.toggle("has-unread", n > 0);
     countEl.classList.toggle("zero", n === 0);
-    if (countEl.textContent !== String(n)) {
-      countEl.textContent = String(n);
-      if (!REDUCED) { countEl.style.animation = "none"; void countEl.offsetWidth; countEl.style.animation = "countRoll .2s var(--settle)"; }
-    }
+    refreshCountLabel();
   }
 
   function setBadge(el, n) {
@@ -1199,7 +1233,8 @@
     // focused textarea and lose what the user is typing. Defer and re-render on blur/submit.
     if (quickReplyIsActive()) { pendingRelaysRender = true; return; }
     pendingRelaysRender = false;
-    const rows = (payload.relays || []).filter(isRelayListKind);
+    const allRows = (payload.relays || []).filter(isRelayListKind);
+    const rows = peeking ? allRows.filter((row) => row.unread) : allRows;
     relaysEmptyEl.classList.toggle("gone", rows.length > 0);
     const seen = prevRelayIds;
     relaysListEl.innerHTML = rows.map((r) => {
@@ -2115,6 +2150,10 @@
       tasks: Array.isArray(next.tasks) ? next.tasks : [],
       contacts: Array.isArray(next.contacts) ? next.contacts : (payload.contacts || []),
     };
+    const configuredDuration = Number(next.ui && next.ui.notificationDurationMs);
+    notificationDurationMs = Number.isFinite(configuredDuration) && configuredDuration >= 250
+      ? configuredDuration
+      : 7000;
     renderAll();
   }