relay-companion 0.1.36 → 0.1.37

package/overlay/host-select.cjs

@@ -22,28 +22,31 @@ function isRelayBundle(bundle) {
   return clean.includes("relay") || clean.includes("electron");
 }
 
-// Cold-start choice when NEITHER agent is running: pick by what's installed.
-// macOS preserves the original preference (Codex, then Claude). Windows is
-// Claude-only for now: the Codex materializer still depends on macOS Codex
-// Desktop paths/app-server behavior, while Claude's claude:// resume handler is
-// registered by Claude Desktop on Windows.
+// Cold-start choice when NEITHER agent is foregrounded/running: pick by what's
+// installed. When BOTH are available and neither is foregrounded, prefer Claude
+// (per the product rule: "if I have claude and codex and neither is foregrounded,
+// foreground claude"). Windows is Claude-only for now: the Codex materializer still
+// depends on macOS Codex Desktop paths/app-server behavior, while Claude's claude://
+// resume handler is registered by Claude Desktop on Windows.
 function defaultClickHost({ codexInstalled = false, claudeInstalled = false, platform = process.platform } = {}) {
   if (platform === "win32") return "claude";
-  if (codexInstalled) return "codex";
   if (claudeInstalled) return "claude";
-  return "codex";
+  if (codexInstalled) return "codex";
+  return "claude";
 }
 
 // Decide which host a pill click should open into. Precedence, strongest signal first:
-//   1. The frontmost app IS a host — the user is literally looking at it.
+//   1. The frontmost app IS a host — the user is literally looking at it, so open there.
+//      (Codex frontmost -> Codex; Claude frontmost -> Claude.)
 //   2. The click momentarily activated the accessory overlay (or no frontmost app could
-//      be read) AND a host was foregrounded moments ago — use that captured host.
+//      be read) AND a host was foregrounded moments ago — use that just-foregrounded host.
 //   3. Exactly one host PROCESS is running — route to it. This is the off-Space fix:
 //      `ps` sees a host on any Space, so a running-but-not-frontmost Claude wins over a
-//      closed Codex instead of cold-starting Codex.
-//   4. Both hosts are running and none is frontmost — fall back to the most-recently
-//      foregrounded host if we ever saw one.
-//   5. Nothing better — installed-preference default (true cold start).
+//      closed Codex instead of cold-starting Codex. (Only Codex up -> Codex; only Claude
+//      up -> Claude.)
+//   4. Both hosts are running but NEITHER is foregrounded — prefer Claude (product rule).
+//   5. Nothing running — installed-preference default (true cold start; prefers Claude
+//      when both are installed).
 function chooseClickHost({
   frontHost = null,
   bundle = null,
@@ -67,7 +70,8 @@ function chooseClickHost({
 
   if (claudeRunning && !effectiveCodexRunning) return "claude";
   if (effectiveCodexRunning && !claudeRunning) return "codex";
-  if (claudeRunning && effectiveCodexRunning && lastHost) return lastHost;
+  // Both running, neither foregrounded (and none foregrounded moments ago): prefer Claude.
+  if (claudeRunning && effectiveCodexRunning) return "claude";
 
   return defaultClickHost({ codexInstalled: effectiveCodexInstalled, claudeInstalled, platform });
 }

package/overlay/main.cjs

@@ -631,6 +631,23 @@ function rememberForegroundHost(host) {
   lastHostSeenAt = Date.now();
 }
 
+// Bring the host app to the FOREGROUND so the just-opened relay is actually visible.
+// shell.openExternal(claude://…) / the Codex bridge route the content to the host but
+// do NOT reliably raise it: the overlay is a non-activating accessory window, and a
+// host sitting on another macOS Space stays put (observed live: "it opened it in claude
+// (good) but didnt foreground claude"). `open -b <bundle>` activates the app — switching
+// to its Space and launching it if it wasn't running. `-g` is intentionally NOT passed,
+// because raising the app is exactly the point.
+const HOST_BUNDLE_ID = { claude: "com.anthropic.claudefordesktop", codex: "com.openai.codex" };
+function activateHost(host) {
+  if (process.platform !== "darwin") return; // Windows foregrounding is handled by its own open path
+  const bundle = HOST_BUNDLE_ID[host];
+  if (!bundle) return;
+  execFile("/usr/bin/open", ["-b", bundle], (error) => {
+    if (error) console.error("[overlay] activateHost failed:", host, error && error.message);
+  });
+}
+
 function appInstalled(appName) {
   const name = String(appName || "").replace(/[^A-Za-z0-9 ._-]/g, "");
   if (!name) return false;
@@ -878,6 +895,10 @@ function openPacket(packetId) {
         freshlyForged = Boolean(parsed.claudeFreshlyForged);
       } catch {}
       if (url || skipExternalOpen) {
+        // Raise the host so the relay is visible, whichever open path ran (Claude deep
+        // link, Codex bridge, or a plain url). This is the fix for "opened in the right
+        // host but didn't foreground it".
+        activateHost(host);
         if (url && !skipExternalOpen) {
           const webFallback = row && row.taskId ? taskWebUrl(row.taskId) : row && row.actionUrl ? absoluteUrl(row.actionUrl) : webBase();
           if (claudeSessionIdFromUrl(url)) {
@@ -952,6 +973,7 @@ function openTaskDetail(taskId) {
         freshlyForged = Boolean(parsed.claudeFreshlyForged);
       } catch {}
       if (url || skipExternalOpen) {
+        activateHost(host); // raise the host so the opened task is visible
         if (url && !skipExternalOpen) {
           if (claudeSessionIdFromUrl(url)) {
             openClaudeDeepLinkVerified(url, taskWebUrl(taskId), taskId, { freshlyForged });

package/package.json

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